Wao-commits

Download

wao-commits@list.forge.codelutin.com

2352 discussions

r1692 - trunk/wao-services/src/main/resources/i18n
by bleny＠users.forge.codelutin.com 28 Feb '14

28 Feb '14

Author: bleny Date: 2014-02-28 12:13:04 +0100 (Fri, 28 Feb 2014) New Revision: 1692 Url: http://codelutin.com/projects/wao/repository/revisions/1692 Log: remove empty bundles Removed: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties Deleted: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== Deleted: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties ===================================================================

1 0

r1691 - trunk/wao-services/src/main/java/fr/ifremer/wao/services/service
by bleny＠users.forge.codelutin.com 26 Feb '14

26 Feb '14

Author: bleny Date: 2014-02-26 12:13:59 +0100 (Wed, 26 Feb 2014) New Revision: 1691 Url: http://codelutin.com/projects/wao/repository/revisions/1691 Log: introduce commit() helper in WaoServiceSupport Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/NewsService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/NewsService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/NewsService.java 2014-02-26 11:06:26 UTC (rev 1690) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/NewsService.java 2014-02-26 11:13:59 UTC (rev 1691) @@ -44,7 +44,7 @@ newsDao.delete(news); - getPersistenceContext().commit(); + commit(); } @@ -83,7 +83,7 @@ } - getPersistenceContext().commit(); + commit(); } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java 2014-02-26 11:06:26 UTC (rev 1690) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java 2014-02-26 11:13:59 UTC (rev 1691) @@ -5,7 +5,6 @@ import fr.ifremer.wao.services.WaoService; import fr.ifremer.wao.services.WaoServiceContext; import fr.ifremer.wao.services.WaoWebApplicationContext; -import fr.ifremer.wao.services.service.SamplingPlanService; import java.util.Date; @@ -42,4 +41,8 @@ return newService(SamplingPlanService.class); } + protected void commit() { + getPersistenceContext().commit(); + } + }

1 0

r1690 - in trunk/wao-services/src/main/java/fr/ifremer/wao/services/service: . csv csv/operations
by bleny＠users.forge.codelutin.com 26 Feb '14

26 Feb '14

Author: bleny Date: 2014-02-26 12:06:26 +0100 (Wed, 26 Feb 2014) New Revision: 1690 Url: http://codelutin.com/projects/wao/repository/revisions/1690 Log: import CSV models and operations Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCode.java Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatGroupImportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/FishingZoneImportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsDebSamplingPlanImportExportModel.java 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/RawObsDebCodesImportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialDivisionImportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialLocationImportModel.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatImmatriculationParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/CompanyParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ContactStateMotivesParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DCF5CodesParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictNamesFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LatitudeParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LocationTypeParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LongitudeParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ObsDebCodeParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ObservedDataControlParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/PortParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowCodeParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UserParserFormatter.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java Property changes on: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv ___________________________________________________________________ Added: svn:mergeinfo + /branches/wao-1.5.x/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models:679-733 Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatGroupImportModel.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/BoatGroupImportModel.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatGroupImportModel.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,17 +21,17 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models; +package fr.ifremer.wao.services.service.csv; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatGroupImpl; import fr.ifremer.wao.entity.BoatImpl; -import fr.ifremer.wao.io.csv2.models.operations.BoatImmatriculationParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.BoatImmatriculationParserFormatter; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import org.nuiton.util.csv.ValueGetterSetter; +import org.nuiton.csv.ImportModel; +import org.nuiton.csv.ImportableColumn; +import org.nuiton.csv.ModelBuilder; +import org.nuiton.csv.ValueGetterSetter; import java.util.List; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/BoatImportExportModel.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/BoatImportExportModel.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,23 +21,23 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models; +package fr.ifremer.wao.services.service.csv; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.BoatImpl; import fr.ifremer.wao.entity.FleetImpl; import fr.ifremer.wao.entity.ShipOwnerImpl; import fr.ifremer.wao.entity.TerrestrialLocation; -import fr.ifremer.wao.io.csv2.models.operations.BoatImmatriculationParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.DistrictParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.PortParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.BoatImmatriculationParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.DistrictParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.PortParserFormatter; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.Common; -import org.nuiton.util.csv.ExportableColumn; -import org.nuiton.util.csv.ImportExportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import org.nuiton.util.csv.ValueGetterSetter; +import org.nuiton.csv.Common; +import org.nuiton.csv.ExportableColumn; +import org.nuiton.csv.ImportExportModel; +import org.nuiton.csv.ImportableColumn; +import org.nuiton.csv.ModelBuilder; +import org.nuiton.csv.ValueGetterSetter; import java.util.List; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactImportExportModel.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactImportExportModel.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,42 +21,42 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models; +package fr.ifremer.wao.services.service.csv; -import fr.ifremer.wao.WaoUtils; -import fr.ifremer.wao.bean.ContactState; -import fr.ifremer.wao.bean.DataReliability; -import fr.ifremer.wao.bean.LocationType; -import fr.ifremer.wao.bean.ObsProgram; -import fr.ifremer.wao.bean.ObservationType; import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.Contact; import fr.ifremer.wao.entity.ContactImpl; +import fr.ifremer.wao.entity.ContactState; import fr.ifremer.wao.entity.ContactStateMotif; +import fr.ifremer.wao.entity.DataReliability; +import fr.ifremer.wao.entity.LocationType; import fr.ifremer.wao.entity.ObsDebCode; +import fr.ifremer.wao.entity.ObsProgram; +import fr.ifremer.wao.entity.ObservationType; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.entity.WaoUser; -import fr.ifremer.wao.io.csv2.models.operations.BoatParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.CompanyParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.ContactStateMotivesParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.LocationTypeParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.ObsDebCodeParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.ObservedDataControlParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.SampleRowParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.UserParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.UsersParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.BoatParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.CompanyParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.ContactStateMotivesParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.LocationTypeParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.ObsDebCodeParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.ObservedDataControlParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.SampleRowParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.UserParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.UsersParserFormatter; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.Common; -import org.nuiton.util.csv.ExportableColumn; -import org.nuiton.util.csv.ImportExportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import org.nuiton.util.csv.ValueFormatter; -import org.nuiton.util.csv.ValueGetter; -import org.nuiton.util.csv.ValueGetterSetter; -import org.nuiton.util.csv.ValueParserFormatter; +import org.nuiton.csv.Common; +import org.nuiton.csv.ExportableColumn; +import org.nuiton.csv.ImportExportModel; +import org.nuiton.csv.ImportableColumn; +import org.nuiton.csv.ModelBuilder; +import org.nuiton.csv.ValueFormatter; +import org.nuiton.csv.ValueGetter; +import org.nuiton.csv.ValueGetterSetter; +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.HashMap; @@ -113,12 +113,12 @@ throw new RuntimeException(e); } if (locationType == null) { - throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.locationTypeMissing")); + throw new IllegalArgumentException(I18n.t("wao.import.contact.failure.locationTypeMissing")); } terrestrialLocation = indexedLocations.get(locationType).get(code); if (terrestrialLocation == null) { - throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongTerrestrialLocation", - locationType.toString(), code)); + throw new IllegalArgumentException(I18n.t("wao.import.contact.failure.wrongTerrestrialLocation", + locationType.toString(), code)); } } return terrestrialLocation; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ContactStateMotivesImportModel.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ContactStateMotivesImportModel.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,16 +21,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models; +package fr.ifremer.wao.services.service.csv; -import fr.ifremer.wao.WaoUtils; -import fr.ifremer.wao.bean.ContactState; +import fr.ifremer.wao.entity.ContactState; import fr.ifremer.wao.entity.ContactStateMotif; import fr.ifremer.wao.entity.ContactStateMotifImpl; -import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import org.nuiton.util.csv.ValueParser; +import org.nuiton.csv.ImportModel; +import org.nuiton.csv.ImportableColumn; +import org.nuiton.csv.ModelBuilder; +import org.nuiton.csv.ValueParser; +import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.List; @@ -67,7 +67,7 @@ @Override public String parse(String value) throws ParseException { if (value.length() != 6) { - throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongColor", value)); + throw new IllegalArgumentException(I18n.t("wao.import.contact.failure.wrongColor", value)); } return value.trim(); } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/FishingZoneImportModel.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/FishingZoneImportModel.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/FishingZoneImportModel.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,15 +21,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models; +package fr.ifremer.wao.services.service.csv; import fr.ifremer.wao.entity.FishingZone; import fr.ifremer.wao.entity.FishingZoneImpl; -import fr.ifremer.wao.io.csv2.models.operations.LatitudeParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.LongitudeParserFormatter; -import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; +import fr.ifremer.wao.services.service.csv.operations.LatitudeParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.LongitudeParserFormatter; +import org.nuiton.csv.ImportModel; +import org.nuiton.csv.ImportableColumn; +import org.nuiton.csv.ModelBuilder; import java.util.Collection; import java.util.List; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsDebSamplingPlanImportExportModel.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsDebSamplingPlanImportExportModel.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsDebSamplingPlanImportExportModel.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -18,32 +18,32 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models; +package fr.ifremer.wao.services.service.csv; -import fr.ifremer.wao.bean.ConnectedUser; -import fr.ifremer.wao.bean.ObsProgram; -import fr.ifremer.wao.bean.ObservationType; + import fr.ifremer.wao.entity.Boat; import fr.ifremer.wao.entity.Company; +import fr.ifremer.wao.entity.ObsProgram; +import fr.ifremer.wao.entity.ObservationType; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowImpl; import fr.ifremer.wao.entity.TerrestrialDivision; import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.entity.WaoUser; -import fr.ifremer.wao.io.csv2.models.operations.BoatParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.CompanyParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.RegionParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.SampleRowCodeParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.UsersParserFormatter; -import org.nuiton.util.csv.Common; -import org.nuiton.util.csv.ExportableColumn; -import org.nuiton.util.csv.ImportExportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import org.nuiton.util.csv.ValueGetterSetter; -import org.nuiton.util.csv.ValueParserFormatter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import fr.ifremer.wao.services.service.csv.operations.BoatParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.CompanyParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.RegionParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.SampleRowCodeParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.UsersParserFormatter; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.csv.Common; +import org.nuiton.csv.ExportableColumn; +import org.nuiton.csv.ImportExportModel; +import org.nuiton.csv.ImportableColumn; +import org.nuiton.csv.ModelBuilder; +import org.nuiton.csv.ValueGetterSetter; +import org.nuiton.csv.ValueParserFormatter; import java.text.ParseException; import java.util.HashMap; @@ -56,103 +56,12 @@ */ public class ObsDebSamplingPlanImportExportModel implements ImportExportModel<SampleRow> { - private static final Logger log = - LoggerFactory.getLogger(ObsDebSamplingPlanImportExportModel.class); + private static final Log log = LogFactory.getLog(ObsDebSamplingPlanImportExportModel.class); - static class ObservationUnitParserFormatter implements ValueParserFormatter<TerrestrialDivision> { + protected static final String BOAT_HEADER_NAME = "NAVIRE_COD"; - /** Index Region code -> UO Code -> Terrestrial division. */ - protected Map<String, Map<String, TerrestrialDivision>> indexedObservationUnits; + protected static final String OBSERVATION_UNIT_HEADER_NAME = "UNITE_OBSERVATION_COD"; - protected List<TerrestrialDivision> observationUnits; - - protected String currentRegionCode; - - ObservationUnitParserFormatter(List<TerrestrialDivision> observationUnits) { - this.observationUnits = observationUnits; - } - - protected void indexObservationUnits(List<TerrestrialDivision> observationUnits) { - indexedObservationUnits = new HashMap<String, Map<String, TerrestrialDivision>>(); - for (TerrestrialDivision terrestrialDivision : observationUnits) { - String regionCode = terrestrialDivision.getRegionIfremer().getRegionIfremerCode(); - Map<String, TerrestrialDivision> unitCodesToDivision = indexedObservationUnits.get(regionCode); - if (unitCodesToDivision == null) { - unitCodesToDivision = new HashMap<String, TerrestrialDivision>(); - } - unitCodesToDivision.put(terrestrialDivision.getObservationUnitCode(), terrestrialDivision); - indexedObservationUnits.put(regionCode, unitCodesToDivision); - } - - if (log.isTraceEnabled()) { - for (Map.Entry<String, Map<String, TerrestrialDivision>> entry : indexedObservationUnits.entrySet()) { - log.trace(entry.getKey()); - for (Map.Entry<String, TerrestrialDivision> unitCodesToDivision : entry.getValue().entrySet()) { - log.trace(" -> " + unitCodesToDivision.getKey() + " -> " - + unitCodesToDivision.getValue()); - } - } - } - } - - @Override - public TerrestrialDivision parse(String observationUnitCode) throws ParseException { - if (indexedObservationUnits == null) { - indexObservationUnits(observationUnits); - } - Map<String, TerrestrialDivision> uos = indexedObservationUnits.get(currentRegionCode); - if (uos == null) { - throw new IllegalArgumentException("Le code de région '" + currentRegionCode - + "' n'est pas un code valide"); - } - TerrestrialDivision observationUnit = uos.get(observationUnitCode); - if (observationUnit == null) { - throw new IllegalArgumentException("Il n'y a pas d'unité '" + observationUnitCode - + "' dans la région '" + currentRegionCode + "'"); - } - return observationUnit; - } - - @Override - public String format(TerrestrialDivision terrestrialDivision) { - String observationUnitCode = ""; - if (terrestrialDivision != null) { - observationUnitCode = terrestrialDivision.getObservationUnitCode(); - } - return observationUnitCode; - } - - public void setCurrentRegionCode(String regionCode) { - currentRegionCode = regionCode; - } - } - - static class RegionCodeSetter implements ValueGetterSetter<SampleRow, String> { - - protected ObservationUnitParserFormatter observationUnitSetter; - - RegionCodeSetter(ObservationUnitParserFormatter observationUnitSetter) { - this.observationUnitSetter = observationUnitSetter; - } - - @Override - public String get(SampleRow sampleRow) throws Exception { - String regionCode; - if (sampleRow.getObservationUnit() == null) { - regionCode = ""; - } else { - regionCode = sampleRow.getObservationUnit().getRegionIfremer() - .getRegionIfremerCode(); - } - return regionCode; - } - - @Override - public void set(SampleRow sampleRow, String regionCode) throws Exception { - observationUnitSetter.setCurrentRegionCode(regionCode); - } - } - protected List<TerrestrialDivision> observationUnits; protected List<WaoUser> allWaoUsers; @@ -163,24 +72,22 @@ protected List<TerrestrialLocation> allRegions; - protected ConnectedUser connectedUser; + /** Si le modèle représente un import/export pour l'admin ou pas */ + protected boolean admin; protected ModelBuilder<SampleRow> modelBuilder; - protected static final String BOAT_HEADER_NAME = "NAVIRE_COD"; - protected static final String OBSERVATION_UNIT_HEADER_NAME = "UNITE_OBSERVATION_COD"; - /** Type of observation, may be phone or work field depending of what the user is importing */ protected ObservationType observationType; /** Constructor used for import */ - public ObsDebSamplingPlanImportExportModel(ConnectedUser connectedUser, + public ObsDebSamplingPlanImportExportModel(boolean admin, List<TerrestrialDivision> observationUnits, List<WaoUser> allWaoUsers, List<Company> allCompanies, List<Boat> allActiveBoats, List<TerrestrialLocation> allRegions) { - this.connectedUser = connectedUser; + this.admin = admin; this.allWaoUsers = allWaoUsers; this.observationUnits = observationUnits; this.allCompanies = allCompanies; @@ -189,8 +96,8 @@ } /** Constructor used for export */ - public ObsDebSamplingPlanImportExportModel(ConnectedUser connectedUser, ObservationType observationType) { - this.connectedUser = connectedUser; + public ObsDebSamplingPlanImportExportModel(boolean admin, ObservationType observationType) { + this.admin = admin; this.observationType = observationType; } @@ -225,8 +132,8 @@ modelBuilder.newColumnForImportExport( "PLAN_CODE", SampleRow.PROPERTY_CODE, - new SampleRowCodeParserFormatter(connectedUser.getProfile().getObsProgram())); - if (connectedUser.isAdmin()) { + new SampleRowCodeParserFormatter(ObsProgram.OBSDEB)); + if (admin) { modelBuilder.newColumnForImportExport( "SOCIETE", SampleRow.PROPERTY_COMPANY, @@ -293,4 +200,98 @@ } return (Iterable) modelBuilder.getColumnsForExport(); } + + protected static class ObservationUnitParserFormatter implements ValueParserFormatter<TerrestrialDivision> { + + /** Index Region code -> UO Code -> Terrestrial division. */ + protected Map<String, Map<String, TerrestrialDivision>> indexedObservationUnits; + + protected List<TerrestrialDivision> observationUnits; + + protected String currentRegionCode; + + ObservationUnitParserFormatter(List<TerrestrialDivision> observationUnits) { + this.observationUnits = observationUnits; + } + + protected void indexObservationUnits(List<TerrestrialDivision> observationUnits) { + indexedObservationUnits = new HashMap<String, Map<String, TerrestrialDivision>>(); + for (TerrestrialDivision terrestrialDivision : observationUnits) { + String regionCode = terrestrialDivision.getRegionIfremer().getRegionIfremerCode(); + Map<String, TerrestrialDivision> unitCodesToDivision = indexedObservationUnits.get(regionCode); + if (unitCodesToDivision == null) { + unitCodesToDivision = new HashMap<String, TerrestrialDivision>(); + } + unitCodesToDivision.put(terrestrialDivision.getObservationUnitCode(), terrestrialDivision); + indexedObservationUnits.put(regionCode, unitCodesToDivision); + } + + if (log.isTraceEnabled()) { + for (Map.Entry<String, Map<String, TerrestrialDivision>> entry : indexedObservationUnits.entrySet()) { + log.trace(entry.getKey()); + for (Map.Entry<String, TerrestrialDivision> unitCodesToDivision : entry.getValue().entrySet()) { + log.trace(" -> " + unitCodesToDivision.getKey() + " -> " + + unitCodesToDivision.getValue()); + } + } + } + } + + @Override + public TerrestrialDivision parse(String observationUnitCode) throws ParseException { + if (indexedObservationUnits == null) { + indexObservationUnits(observationUnits); + } + Map<String, TerrestrialDivision> uos = indexedObservationUnits.get(currentRegionCode); + if (uos == null) { + throw new IllegalArgumentException("Le code de région '" + currentRegionCode + + "' n'est pas un code valide"); + } + TerrestrialDivision observationUnit = uos.get(observationUnitCode); + if (observationUnit == null) { + throw new IllegalArgumentException("Il n'y a pas d'unité '" + observationUnitCode + + "' dans la région '" + currentRegionCode + "'"); + } + return observationUnit; + } + + @Override + public String format(TerrestrialDivision terrestrialDivision) { + String observationUnitCode = ""; + if (terrestrialDivision != null) { + observationUnitCode = terrestrialDivision.getObservationUnitCode(); + } + return observationUnitCode; + } + + public void setCurrentRegionCode(String regionCode) { + currentRegionCode = regionCode; + } + } + + protected static class RegionCodeSetter implements ValueGetterSetter<SampleRow, String> { + + protected ObservationUnitParserFormatter observationUnitSetter; + + RegionCodeSetter(ObservationUnitParserFormatter observationUnitSetter) { + this.observationUnitSetter = observationUnitSetter; + } + + @Override + public String get(SampleRow sampleRow) throws Exception { + String regionCode; + if (sampleRow.getObservationUnit() == null) { + regionCode = ""; + } else { + regionCode = sampleRow.getObservationUnit().getRegionIfremer() + .getRegionIfremerCode(); + } + return regionCode; + } + + @Override + public void set(SampleRow sampleRow, String regionCode) throws Exception { + observationUnitSetter.setCurrentRegionCode(regionCode); + } + } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/ObsMerObsVenteSamplingPlanImportExportModel.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/ObsMerObsVenteSamplingPlanImportExportModel.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,30 +21,36 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models; +package fr.ifremer.wao.services.service.csv; -import fr.ifremer.wao.bean.ObsProgram; -import fr.ifremer.wao.bean.SamplingStrategy; + +import com.opensymphony.xwork2.util.logging.Logger; +import com.opensymphony.xwork2.util.logging.LoggerFactory; import fr.ifremer.wao.entity.Company; import fr.ifremer.wao.entity.FishingZone; +import fr.ifremer.wao.entity.ObsProgram; import fr.ifremer.wao.entity.Profession; import fr.ifremer.wao.entity.ProfessionImpl; import fr.ifremer.wao.entity.SampleMonth; import fr.ifremer.wao.entity.SampleMonthImpl; import fr.ifremer.wao.entity.SampleRow; import fr.ifremer.wao.entity.SampleRowImpl; +import fr.ifremer.wao.entity.SamplingStrategy; import fr.ifremer.wao.entity.TerrestrialLocation; -import fr.ifremer.wao.io.csv2.models.operations.*; +import fr.ifremer.wao.services.service.csv.operations.CompanyParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.DCF5CodesParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.DistrictNamesFormatter; +import fr.ifremer.wao.services.service.csv.operations.DistrictsParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.FishingZonesParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.SampleRowCodeParserFormatter; +import org.nuiton.csv.Common; +import org.nuiton.csv.ExportableColumn; +import org.nuiton.csv.ImportExportModel; +import org.nuiton.csv.ImportableColumn; +import org.nuiton.csv.ModelBuilder; +import org.nuiton.csv.ValueGetterSetter; +import org.nuiton.csv.ValueParserFormatter; import org.nuiton.util.PeriodDates; -import org.nuiton.util.csv.Common; -import org.nuiton.util.csv.ExportableColumn; -import org.nuiton.util.csv.ImportExportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import org.nuiton.util.csv.ValueGetterSetter; -import org.nuiton.util.csv.ValueParserFormatter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.text.ParseException; import java.text.SimpleDateFormat; Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCode.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCode.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCode.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -0,0 +1,46 @@ +package fr.ifremer.wao.services.service.csv; + +import fr.ifremer.wao.entity.TerrestrialLocation; + +/** + * Représente une ligne de fichier CSV du référentiel des codes ObsDeb. + */ +public class RawObsDebCode { + + public static final String PROPERTY_CODE = "code"; + + public static final String PROPERTY_LABEL = "label"; + + public static final String PROPERTY_REGION = "region"; + + protected String code; + + protected String label; + + protected TerrestrialLocation region; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public TerrestrialLocation getRegion() { + return region; + } + + public void setRegion(TerrestrialLocation region) { + this.region = region; + } + +} Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCodesImportModel.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/RawObsDebCodesImportModel.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/RawObsDebCodesImportModel.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,15 +21,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models; +package fr.ifremer.wao.services.service.csv; -import fr.ifremer.wao.bean.RawObsDebCode; -import fr.ifremer.wao.bean.RawObsDebCodeImpl; + import fr.ifremer.wao.entity.TerrestrialLocation; -import fr.ifremer.wao.io.csv2.models.operations.RegionParserFormatter; -import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; +import fr.ifremer.wao.services.service.csv.operations.RegionParserFormatter; +import org.nuiton.csv.ImportModel; +import org.nuiton.csv.ImportableColumn; +import org.nuiton.csv.ModelBuilder; import java.util.List; @@ -55,7 +54,7 @@ @Override public RawObsDebCode newEmptyInstance() { - RawObsDebCode newObsDebCode = new RawObsDebCodeImpl(); + RawObsDebCode newObsDebCode = new RawObsDebCode(); return newObsDebCode; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialDivisionImportModel.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/TerrestrialDivisionImportModel.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialDivisionImportModel.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,18 +21,18 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models; +package fr.ifremer.wao.services.service.csv; import fr.ifremer.wao.entity.TerrestrialDivision; import fr.ifremer.wao.entity.TerrestrialDivisionImpl; import fr.ifremer.wao.entity.TerrestrialLocation; -import fr.ifremer.wao.io.csv2.models.operations.PortParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.RegionParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.PortParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.RegionParserFormatter; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import org.nuiton.util.csv.ValueParser; +import org.nuiton.csv.ImportModel; +import org.nuiton.csv.ImportableColumn; +import org.nuiton.csv.ModelBuilder; +import org.nuiton.csv.ValueParser; import java.util.List; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialLocationImportModel.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/TerrestrialLocationImportModel.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/TerrestrialLocationImportModel.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -18,19 +18,20 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models; +package fr.ifremer.wao.services.service.csv; -import fr.ifremer.wao.bean.LocationType; + +import fr.ifremer.wao.entity.LocationType; import fr.ifremer.wao.entity.TerrestrialLocation; import fr.ifremer.wao.entity.TerrestrialLocationImpl; -import fr.ifremer.wao.io.csv2.models.operations.LatitudeParserFormatter; -import fr.ifremer.wao.io.csv2.models.operations.LongitudeParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.LatitudeParserFormatter; +import fr.ifremer.wao.services.service.csv.operations.LongitudeParserFormatter; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import org.nuiton.util.csv.ValueParser; -import org.nuiton.util.csv.ValueSetter; +import org.nuiton.csv.ImportModel; +import org.nuiton.csv.ImportableColumn; +import org.nuiton.csv.ModelBuilder; +import org.nuiton.csv.ValueParser; +import org.nuiton.csv.ValueSetter; import java.util.List; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatImmatriculationParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/BoatImmatriculationParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatImmatriculationParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,10 +21,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; -import org.nuiton.util.csv.ValueParserFormatter; +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.regex.Matcher; @@ -43,7 +43,7 @@ public class BoatImmatriculationParserFormatter implements ValueParserFormatter<Integer> { /** Exactly 6 digits */ - Pattern pattern = Pattern.compile("\\d{6}"); + protected Pattern pattern = Pattern.compile("\\d{6}"); @Override public String format(Integer immatriculation) { @@ -60,7 +60,7 @@ public Integer parse(String imma) throws ParseException { Matcher matcher = pattern.matcher(imma); if (!matcher.find()) { - throw new IllegalArgumentException(WaoUtils._("wao.business.boat.validation.immatriculation.wrongFormat")); + throw new IllegalArgumentException(I18n.t("wao.business.boat.validation.immatriculation.wrongFormat")); } Integer immatriculation = Integer.parseInt(imma); return immatriculation; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/BoatParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/BoatParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,11 +21,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; +import com.google.common.collect.Maps; import fr.ifremer.wao.entity.Boat; -import org.nuiton.util.csv.ValueParserFormatter; +import fr.ifremer.wao.entity.Boats; +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.List; @@ -37,7 +39,7 @@ protected Map<Integer, Boat> indexedBoats; public BoatParserFormatter(List<Boat> boats) { - indexedBoats = WaoUtils.projectPropertyUnique(boats, Boat.PROPERTY_IMMATRICULATION); + indexedBoats = Maps.uniqueIndex(boats, Boats.getImmatriculation()); } @Override @@ -49,12 +51,12 @@ public Boat parse(String value) throws ParseException { String trimmedValue = value.trim(); if (trimmedValue.isEmpty()) { - throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.boatMissing")); + throw new IllegalArgumentException(I18n.t("wao.import.contact.failure.boatMissing")); } Integer key = Integer.valueOf(trimmedValue); Boat boat = indexedBoats.get(key); if (boat == null) { - throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongBoat", value)); + throw new IllegalArgumentException(I18n.t("wao.import.contact.failure.wrongBoat", value)); } return boat; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/CompanyParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/CompanyParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/CompanyParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,12 +21,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; +import com.google.common.collect.Maps; +import fr.ifremer.wao.entity.Companies; import fr.ifremer.wao.entity.Company; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.ValueParserFormatter; +import org.nuiton.csv.ValueParserFormatter; import java.text.ParseException; import java.util.List; @@ -55,7 +56,7 @@ @Override public Company parse(String companyName) throws ParseException { if (indexedCompanies == null) { - indexedCompanies = WaoUtils.projectPropertyUnique(companies, Company.PROPERTY_NAME); + indexedCompanies = Maps.uniqueIndex(companies, Companies.getName()); } Company company = null; if (StringUtils.isNotBlank(companyName)) { Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ContactStateMotivesParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/ContactStateMotivesParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ContactStateMotivesParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,12 +21,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; +import com.google.common.collect.Maps; import fr.ifremer.wao.entity.ContactStateMotif; +import fr.ifremer.wao.entity.ContactStateMotives; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.ValueParserFormatter; +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.List; @@ -54,7 +56,7 @@ @Override public ContactStateMotif parse(String code) throws ParseException { if (indexedMotives == null) { - indexedMotives = WaoUtils.projectPropertyUnique(motives, ContactStateMotif.PROPERTY_CODE); + indexedMotives = Maps.uniqueIndex(motives, ContactStateMotives.getCode()); } ContactStateMotif contactStateMotif; if (StringUtils.isBlank(code)) { @@ -62,7 +64,7 @@ } else { contactStateMotif = indexedMotives.get(code.trim()); if (contactStateMotif == null) { - throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongContactStateMotifCode", code)); + throw new IllegalArgumentException(I18n.t("wao.import.contact.failure.wrongContactStateMotifCode", code)); } } return contactStateMotif; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DCF5CodesParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DCF5CodesParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,15 +21,15 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; import fr.ifremer.wao.entity.DCF5Code; import fr.ifremer.wao.entity.DCF5CodeImpl; import fr.ifremer.wao.entity.FishingGearDCFImpl; import fr.ifremer.wao.entity.TargetSpeciesDCFImpl; import org.apache.commons.lang3.StringUtils; +import org.nuiton.csv.ValueParserFormatter; import org.nuiton.util.StringUtil; -import org.nuiton.util.csv.ValueParserFormatter; import java.text.ParseException; import java.util.LinkedList; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictNamesFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictNamesFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictNamesFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,11 +21,11 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; import fr.ifremer.wao.entity.TerrestrialLocation; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.ValueFormatter; +import org.nuiton.csv.ValueFormatter; import java.util.Collection; import java.util.LinkedList; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -1,4 +1,4 @@ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; /* * #%L @@ -25,9 +25,11 @@ */ -import fr.ifremer.wao.WaoUtils; +import com.google.common.collect.Maps; import fr.ifremer.wao.entity.TerrestrialLocation; -import org.nuiton.util.csv.ValueParserFormatter; +import fr.ifremer.wao.entity.TerrestrialLocations; +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.List; @@ -44,7 +46,7 @@ throw new IllegalArgumentException(); } } - indexedDistricts = WaoUtils.projectPropertyUnique(districts, TerrestrialLocation.PROPERTY_DISTRICT_CODE); + indexedDistricts = Maps.uniqueIndex(districts, TerrestrialLocations.getDistrictCode()); } } @@ -61,11 +63,11 @@ public TerrestrialLocation parse(String value) throws ParseException { String trimmedValue = value.trim(); if (trimmedValue.isEmpty()) { - throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.districtMissing")); + throw new IllegalArgumentException(I18n.t("wao.import.contact.failure.districtMissing")); } TerrestrialLocation district = indexedDistricts.get(trimmedValue); if (district == null) { - throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongDistrict", value)); + throw new IllegalArgumentException(I18n.t("wao.import.contact.failure.wrongDistrict", value)); } return district; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DistrictsParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/DistrictsParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,12 +21,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; +import com.google.common.collect.Maps; import fr.ifremer.wao.entity.TerrestrialLocation; +import fr.ifremer.wao.entity.TerrestrialLocations; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.ValueParserFormatter; +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.Collection; @@ -45,7 +47,7 @@ throw new IllegalArgumentException(); } } - indexedDistricts = WaoUtils.projectPropertyUnique(districts, TerrestrialLocation.PROPERTY_DISTRICT_CODE); + indexedDistricts = Maps.uniqueIndex(districts, TerrestrialLocations.getDistrictCode()); } } @@ -64,14 +66,14 @@ @Override public Collection<TerrestrialLocation> parse(String value) throws ParseException { if (StringUtils.isBlank(value)) { - throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.districtMissing")); + throw new IllegalArgumentException(I18n.t("wao.import.contact.failure.districtMissing")); } String[] districtCodes = StringUtils.split(value, ','); Collection<TerrestrialLocation> districts = new LinkedList<TerrestrialLocation>(); for (String districtCode : districtCodes) { TerrestrialLocation district = indexedDistricts.get(districtCode.trim()); if (district == null) { - throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongDistrict", value)); + throw new IllegalArgumentException(I18n.t("wao.import.contact.failure.wrongDistrict", value)); } districts.add(district); } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/FishingZonesParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,12 +21,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; +import com.google.common.collect.Maps; import fr.ifremer.wao.entity.FishingZone; +import fr.ifremer.wao.entity.FishingZones; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.ValueParserFormatter; +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.LinkedList; @@ -58,17 +60,17 @@ @Override public List<FishingZone> parse(String districtCodes) throws ParseException { if (indexedFishingZones == null) { - indexedFishingZones = WaoUtils.projectPropertyUnique(fishingZones, FishingZone.PROPERTY_DISTRICT_CODE); + indexedFishingZones = Maps.uniqueIndex(fishingZones, FishingZones.getDistrictCode()); } List<FishingZone> fishingZones = new LinkedList<FishingZone>(); if (StringUtils.isBlank(districtCodes)) { - throw new IllegalArgumentException(WaoUtils._("wao.import.sampleRow.failure.fishingZoneMissing")); + throw new IllegalArgumentException(I18n.t("wao.import.sampleRow.failure.fishingZoneMissing")); } else { String[] codes = districtCodes.split(","); for (String code : codes) { FishingZone fishingZone = indexedFishingZones.get(code.trim()); if (fishingZone == null) { - throw new IllegalArgumentException(WaoUtils._("wao.import.sampleRow.failure.wrongFishingZone", code.trim())); + throw new IllegalArgumentException(I18n.t("wao.import.sampleRow.failure.wrongFishingZone", code.trim())); } fishingZones.add(fishingZone); } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LatitudeParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/LatitudeParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LatitudeParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,11 +21,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; import org.apache.commons.lang3.Range; -import org.nuiton.util.csv.Common; +import org.nuiton.csv.Common; + public class LatitudeParserFormatter extends Common.DoubleParserFormatter { protected static final Range<Double> VALID_LATITUDES = Range.between(-90., 90.); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LocationTypeParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/LocationTypeParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LocationTypeParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,12 +21,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; -import fr.ifremer.wao.bean.LocationType; +import fr.ifremer.wao.entity.LocationType; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.ValueParserFormatter; +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.HashMap; @@ -58,8 +58,8 @@ locationType = fromStrings.get(value.trim()); if (locationType == null) { throw new IllegalArgumentException( - WaoUtils._("wao.import.failure.wrongLocationType", - value, fromStrings.keySet())); + I18n.t("wao.import.failure.wrongLocationType", + value, fromStrings.keySet())); } } return locationType; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LongitudeParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/LongitudeParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/LongitudeParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,11 +21,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; import org.apache.commons.lang3.Range; -import org.nuiton.util.csv.Common; +import org.nuiton.csv.Common; + public class LongitudeParserFormatter extends Common.DoubleParserFormatter { protected static final Range<Double> VALID_LONGITUDES = Range.between(-180., 180.); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ObsDebCodeParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/ObsDebCodeParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ObsDebCodeParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,12 +21,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; +import com.google.common.collect.Maps; import fr.ifremer.wao.entity.ObsDebCode; +import fr.ifremer.wao.entity.ObsDebCodes; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.ValueParserFormatter; +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.List; @@ -54,14 +56,14 @@ @Override public ObsDebCode parse(String code) throws ParseException { if (indexedObsDebCodes == null) { - indexedObsDebCodes = WaoUtils.projectPropertyUnique(obsDebCodes, ObsDebCode.PROPERTY_CODE); + indexedObsDebCodes = Maps.uniqueIndex(obsDebCodes, ObsDebCodes.getCode()); } ObsDebCode obsDebCode = null; if (StringUtils.isNotBlank(code)) { obsDebCode = indexedObsDebCodes.get(code); if (obsDebCode == null) { throw new IllegalArgumentException - (WaoUtils._("wao.import.failure.wrongObsDebCode", code)); + (I18n.t("wao.import.failure.wrongObsDebCode", code)); } } return obsDebCode; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ObservedDataControlParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/ObservedDataControlParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/ObservedDataControlParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,13 +21,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; import fr.ifremer.wao.entity.ObservedDataControl; import org.apache.commons.lang3.StringUtils; +import org.nuiton.csv.Common; +import org.nuiton.csv.ValueParserFormatter; import org.nuiton.util.StringUtil; -import org.nuiton.util.csv.Common; -import org.nuiton.util.csv.ValueParserFormatter; import java.text.ParseException; import java.util.Collections; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/PortParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/PortParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/PortParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,12 +21,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; +import com.google.common.collect.Maps; import fr.ifremer.wao.entity.TerrestrialLocation; +import fr.ifremer.wao.entity.TerrestrialLocations; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.ValueParserFormatter; +import org.nuiton.csv.ValueParserFormatter; import java.util.List; import java.util.Map; @@ -36,7 +37,7 @@ /** Existing ports * key should be an terrestrial location id {@link fr.ifremer.wao.entity.TerrestrialLocation#getCode()} * and all the values must have {@link fr.ifremer.wao.entity.TerrestrialLocation#getLocationType()} at - * {@link fr.ifremer.wao.bean.LocationType#PORT}. + * {@link fr.ifremer.wao.entity.LocationType#PORT}. */ protected Map<String, TerrestrialLocation> ports; @@ -45,7 +46,7 @@ public PortParserFormatter(List<TerrestrialLocation> ports, boolean allowNullValue) { this.allowNullValue = allowNullValue; if (ports != null) { - this.ports = WaoUtils.projectPropertyUnique(ports, TerrestrialLocation.PROPERTY_CODE); + this.ports = Maps.uniqueIndex(ports, TerrestrialLocations.getCode()); } } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/RegionParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,11 +21,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; +import com.google.common.collect.Maps; import fr.ifremer.wao.entity.TerrestrialLocation; -import org.nuiton.util.csv.ValueParserFormatter; +import fr.ifremer.wao.entity.TerrestrialLocations; +import org.nuiton.csv.ValueParserFormatter; import java.text.ParseException; import java.util.List; @@ -53,8 +54,8 @@ @Override public TerrestrialLocation parse(String regionCode) throws ParseException { if (indexedRegions == null) { - indexedRegions = WaoUtils.projectPropertyUnique( - regions, TerrestrialLocation.PROPERTY_REGION_IFREMER_CODE); + indexedRegions = Maps.uniqueIndex( + regions, TerrestrialLocations.getRegionIfremerCode()); } TerrestrialLocation terrestrialLocation = Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/RegionsParser.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/RegionsParser.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,11 +21,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; +import com.google.common.collect.Maps; import fr.ifremer.wao.entity.TerrestrialLocation; -import org.nuiton.util.csv.ValueParser; +import fr.ifremer.wao.entity.TerrestrialLocations; +import org.nuiton.csv.ValueParser; import java.text.ParseException; import java.util.LinkedList; @@ -45,8 +46,8 @@ @Override public List<TerrestrialLocation> parse(String value) throws ParseException { if (indexedRegions == null) { - indexedRegions = WaoUtils.projectPropertyUnique( - regions, TerrestrialLocation.PROPERTY_REGION_IFREMER_CODE); + indexedRegions = Maps.uniqueIndex( + regions, TerrestrialLocations.getRegionIfremerCode()); } String[] regionCodes = value.split(","); Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowCodeParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowCodeParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowCodeParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,12 +21,13 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; import fr.ifremer.wao.WaoUtils; -import fr.ifremer.wao.bean.ObsProgram; +import fr.ifremer.wao.entity.ObsProgram; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.ValueParserFormatter; +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.regex.Pattern; @@ -48,12 +49,12 @@ public String parse(String value) throws ParseException { String sampleRowCode; if (StringUtils.isBlank(value)) { - throw new IllegalArgumentException(WaoUtils._("wao.import.sampleRow.failure.missingSampleRowCode")); + throw new IllegalArgumentException(I18n.t("wao.import.sampleRow.failure.missingSampleRowCode")); } else { if (sampleRowCodePattern.matcher(value).matches()) { sampleRowCode = value; } else { - throw new IllegalArgumentException(WaoUtils._("wao.import.sampleRow.failure.wrongSampleRowCodeFormat", value.trim())); + throw new IllegalArgumentException(I18n.t("wao.import.sampleRow.failure.wrongSampleRowCodeFormat", value.trim())); } } return sampleRowCode; Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/SampleRowParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SampleRowParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,12 +21,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; +import com.google.common.collect.Maps; import fr.ifremer.wao.entity.SampleRow; +import fr.ifremer.wao.entity.SampleRows; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.ValueParserFormatter; +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.List; @@ -37,7 +39,7 @@ protected Map<String, SampleRow> indexedSampleRows; public SampleRowParserFormatter(List<SampleRow> sampleRows) { - indexedSampleRows = WaoUtils.projectPropertyUnique(sampleRows, SampleRow.PROPERTY_CODE); + indexedSampleRows = Maps.uniqueIndex(sampleRows, SampleRows.getCode()); } @Override @@ -49,11 +51,11 @@ public SampleRow parse(String sampleRowCode) throws ParseException { String trimmedCode = sampleRowCode.trim(); if (StringUtils.isEmpty(trimmedCode)) { - throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.sampleRowCodeMissing")); + throw new IllegalArgumentException(I18n.t("wao.import.contact.failure.sampleRowCodeMissing")); } SampleRow sampleRow = indexedSampleRows.get(sampleRowCode); if (sampleRow == null) { - throw new IllegalArgumentException(WaoUtils._("wao.import.contact.failure.wrongSampleRowCode", sampleRowCode)); + throw new IllegalArgumentException(I18n.t("wao.import.contact.failure.wrongSampleRowCode", sampleRowCode)); } return sampleRow; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UserParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UserParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UserParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,12 +21,14 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; +import com.google.common.collect.Maps; import fr.ifremer.wao.entity.WaoUser; -import org.nuiton.util.csv.ValueParserFormatter; +import fr.ifremer.wao.entity.WaoUsers; +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.List; @@ -38,7 +40,7 @@ protected Map<String, WaoUser> indexedWaoUsers; public UserParserFormatter(List<WaoUser> waoUsers) { - this.indexedWaoUsers = WaoUtils.projectPropertyUnique(waoUsers, WaoUser.PROPERTY_LOGIN); + this.indexedWaoUsers = Maps.uniqueIndex(waoUsers, WaoUsers.getLogin()); } @Override @@ -51,7 +53,7 @@ public WaoUser parse(String login) throws ParseException { WaoUser user = indexedWaoUsers.get(login.trim()); if (user == null) { - throw new IllegalArgumentException(WaoUtils._("wao.import.failure.wrongUser", login)); + throw new IllegalArgumentException(I18n.t("wao.import.failure.wrongUser", login)); } return user; } Modified: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java =================================================================== --- tags/wao-3.4.1/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/UsersParserFormatter.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/UsersParserFormatter.java 2014-02-26 11:06:26 UTC (rev 1690) @@ -21,18 +21,20 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package fr.ifremer.wao.io.csv2.models.operations; +package fr.ifremer.wao.services.service.csv.operations; -import fr.ifremer.wao.WaoUtils; +import com.google.common.collect.Iterables; +import com.google.common.collect.Maps; import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.entity.WaoUsers; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.csv.ValueParserFormatter; +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.i18n.I18n; import java.text.ParseException; import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Set; public class UsersParserFormatter implements ValueParserFormatter<List<WaoUser>> { @@ -42,12 +44,12 @@ protected Map<String, WaoUser> indexedWaoUsers; public UsersParserFormatter(List<WaoUser> waoUsers) { - this.indexedWaoUsers = WaoUtils.projectPropertyUnique(waoUsers, WaoUser.PROPERTY_LOGIN); + this.indexedWaoUsers = Maps.uniqueIndex(waoUsers, WaoUsers.getLogin()); } @Override public String format(List<WaoUser> value) { - Set<String> usersLogin = WaoUtils.<String, WaoUser> projectPropertyUnique(value, WaoUser.PROPERTY_LOGIN).keySet(); + Iterable<String> usersLogin = Iterables.transform(value, WaoUsers.getLogin()); String commaSeparatedLogins = StringUtils.join(usersLogin, ", "); return commaSeparatedLogins; } @@ -60,7 +62,7 @@ String trimmedLogin = login.trim(); WaoUser user = indexedWaoUsers.get(trimmedLogin); if (user == null) { - throw new IllegalArgumentException(WaoUtils._("wao.import.failure.wrongUser", login)); + throw new IllegalArgumentException(I18n.t("wao.import.failure.wrongUser", login)); } users.add(user); }

1 0

r1689 - in trunk/wao-persistence/src/main: java/fr/ifremer/wao/entity xmi
by bleny＠users.forge.codelutin.com 26 Feb '14

26 Feb '14

Author: bleny Date: 2014-02-26 12:02:04 +0100 (Wed, 26 Feb 2014) New Revision: 1689 Url: http://codelutin.com/projects/wao/repository/revisions/1689 Log: add SampleRow#getSampleMonth(date) Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java trunk/wao-persistence/src/main/xmi/wao.zargo Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java 2014-02-26 10:17:06 UTC (rev 1688) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleMonthImpl.java 2014-02-26 11:02:04 UTC (rev 1689) @@ -24,15 +24,23 @@ package fr.ifremer.wao.entity; +import fr.ifremer.wao.WaoUtils; + +import java.util.Date; + /** - * SampleMonthImpl - * - * Created: 2 déc. 2009 - * - * @author fdesbois <fdesbois(a)codelutin.com> + * Répresente un mois dans l'année et l'effor d'observation associé (pour ObsMer et ObsVente) */ public class SampleMonthImpl extends SampleMonthAbstract { private static final long serialVersionUID = 1L; + @Override + public boolean isPeriodDatesContains(Date date) { + Date month = getPeriodDate(); + // XXX brendan 26/02/14 trick + boolean periodDatesContains = WaoUtils.formatMonth(month).equals(WaoUtils.formatMonth(date)); + return periodDatesContains; + } + } Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-02-26 10:17:06 UTC (rev 1688) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRowImpl.java 2014-02-26 11:02:04 UTC (rev 1689) @@ -24,10 +24,12 @@ package fr.ifremer.wao.entity; +import com.google.common.base.Preconditions; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; +import java.util.Date; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; @@ -251,6 +253,19 @@ } @Override + public SampleMonth getSampleMonth(Date date) { + Preconditions.checkState( + ! getObsProgram().equals(ObsProgram.OBSDEB), + "opération non prévue pour ObsDeb"); + for (SampleMonth sampleMonth : getSampleMonth()) { + if (sampleMonth.isPeriodDatesContains(date)) { + return sampleMonth; + } + } + return null; + } + + @Override public String toString() { StringBuffer stringBuffer = new StringBuffer(); stringBuffer.append(getCode()).append(" (").append(getObsProgram()); Modified: trunk/wao-persistence/src/main/xmi/wao.zargo =================================================================== (Binary files differ)

1 0

r1688 - in trunk/wao-persistence/src/main/java/fr/ifremer/wao: . entity
by bleny＠users.forge.codelutin.com 26 Feb '14

26 Feb '14

Author: bleny Date: 2014-02-26 11:17:06 +0100 (Wed, 26 Feb 2014) New Revision: 1688 Url: http://codelutin.com/projects/wao/repository/revisions/1688 Log: add some guava functions about entities Added: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Boats.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStateMotives.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/FishingZones.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsDebCodes.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRows.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java Modified: trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-02-25 16:41:01 UTC (rev 1687) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/WaoUtils.java 2014-02-26 10:17:06 UTC (rev 1688) @@ -1,8 +1,11 @@ package fr.ifremer.wao; +import fr.ifremer.wao.entity.ObsProgram; + import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.regex.Pattern; public class WaoUtils { @@ -34,4 +37,8 @@ DateFormat dateFormat = new SimpleDateFormat(pattern); return dateFormat.format(date); } + + public static Pattern getSampleRowCodePattern(ObsProgram obsProgram) { + return Pattern.compile("^(\\d{4})_" + obsProgram.getShortCode() + "(\\d{4})$"); + } } Added: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Boats.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Boats.java (rev 0) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Boats.java 2014-02-26 10:17:06 UTC (rev 1688) @@ -0,0 +1,19 @@ +package fr.ifremer.wao.entity; + +import com.google.common.base.Function; + +public class Boats { + + public static Function<Boat, Integer> getImmatriculation() { + return new GetImmatriculation(); + } + + protected static class GetImmatriculation implements Function<Boat, Integer> { + + @Override + public Integer apply(Boat input) { + Integer immatriculation = input.getImmatriculation(); + return immatriculation; + } + } +} Added: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java (rev 0) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/Companies.java 2014-02-26 10:17:06 UTC (rev 1688) @@ -0,0 +1,18 @@ +package fr.ifremer.wao.entity; + +import com.google.common.base.Function; + +public class Companies { + + public static Function<Company, String> getName() { + return new GetName(); + } + + protected static class GetName implements Function<Company, String> { + + @Override + public String apply(Company input) { + return input.getName(); + } + } +} Added: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStateMotives.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStateMotives.java (rev 0) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ContactStateMotives.java 2014-02-26 10:17:06 UTC (rev 1688) @@ -0,0 +1,18 @@ +package fr.ifremer.wao.entity; + +import com.google.common.base.Function; + +public class ContactStateMotives { + + public static Function<ContactStateMotif, String> getCode() { + return new GetCode(); + } + + protected static class GetCode implements Function<ContactStateMotif, String> { + + @Override + public String apply(ContactStateMotif input) { + return input.getCode(); + } + } +} Added: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/FishingZones.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/FishingZones.java (rev 0) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/FishingZones.java 2014-02-26 10:17:06 UTC (rev 1688) @@ -0,0 +1,19 @@ +package fr.ifremer.wao.entity; + +import com.google.common.base.Function; + +public class FishingZones { + + public static Function<FishingZone, String> getDistrictCode() { + return new GetDistrictCode(); + } + + protected static class GetDistrictCode implements Function<FishingZone, String> { + + @Override + public String apply(FishingZone input) { + return input.getDistrictCode(); + } + } + +} Added: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsDebCodes.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsDebCodes.java (rev 0) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/ObsDebCodes.java 2014-02-26 10:17:06 UTC (rev 1688) @@ -0,0 +1,19 @@ +package fr.ifremer.wao.entity; + +import com.google.common.base.Function; + +public class ObsDebCodes { + + public static Function<ObsDebCode, String> getCode() { + return new GetCode(); + } + + protected static class GetCode implements Function<ObsDebCode, String> { + + @Override + public String apply(ObsDebCode input) { + return input.getCode(); + } + } + +} Added: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRows.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRows.java (rev 0) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/SampleRows.java 2014-02-26 10:17:06 UTC (rev 1688) @@ -0,0 +1,18 @@ +package fr.ifremer.wao.entity; + +import com.google.common.base.Function; + +public class SampleRows { + + public static Function<SampleRow, String> getCode() { + return new GetCode(); + } + + protected static class GetCode implements Function<SampleRow, String> { + + @Override + public String apply(SampleRow input) { + return input.getCode(); + } + } +} Added: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java (rev 0) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/TerrestrialLocations.java 2014-02-26 10:17:06 UTC (rev 1688) @@ -0,0 +1,42 @@ +package fr.ifremer.wao.entity; + +import com.google.common.base.Function; + +public class TerrestrialLocations { + + public static Function<TerrestrialLocation, String> getDistrictCode() { + return new GetDistrictCode(); + } + + public static Function<TerrestrialLocation, String> getCode() { + return new GetCode(); + } + + public static Function<TerrestrialLocation, String> getRegionIfremerCode() { + return new GetRegionIfremerCode(); + } + + protected static class GetDistrictCode implements Function<TerrestrialLocation, String> { + + @Override + public String apply(TerrestrialLocation input) { + return input.getDistrictCode(); + } + } + + protected static class GetCode implements Function<TerrestrialLocation, String> { + + @Override + public String apply(TerrestrialLocation input) { + return input.getCode(); + } + } + + protected static class GetRegionIfremerCode implements Function<TerrestrialLocation, String> { + + @Override + public String apply(TerrestrialLocation input) { + return input.getRegionIfremerCode(); + } + } +} Added: trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java =================================================================== --- trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java (rev 0) +++ trunk/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java 2014-02-26 10:17:06 UTC (rev 1688) @@ -0,0 +1,18 @@ +package fr.ifremer.wao.entity; + +import com.google.common.base.Function; + +public class WaoUsers { + + public static Function<WaoUser, String> getLogin() { + return new GetLogin(); + } + + protected static class GetLogin implements Function<WaoUser, String> { + + @Override + public String apply(WaoUser input) { + return input.getLogin(); + } + } +}

1 0

r1680 - in trunk: wao-persistence/src/main/resources wao-web/src/main/resources wao-web/src/main/webapp/WEB-INF/decorators
by bleny＠users.forge.codelutin.com 25 Feb '14

25 Feb '14

Author: bleny Date: 2014-02-25 12:08:18 +0100 (Tue, 25 Feb 2014) New Revision: 1680 Url: http://codelutin.com/projects/wao/repository/revisions/1680 Log: layout, disable shiro, use LegacyTopiaIdFactory Modified: trunk/wao-persistence/src/main/resources/wao.properties trunk/wao-web/src/main/resources/shiro.ini trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp Modified: trunk/wao-persistence/src/main/resources/wao.properties =================================================================== --- trunk/wao-persistence/src/main/resources/wao.properties 2014-01-24 14:14:56 UTC (rev 1679) +++ trunk/wao-persistence/src/main/resources/wao.properties 2014-02-25 11:08:18 UTC (rev 1680) @@ -15,3 +15,5 @@ hibernate.c3p0.max_statements=50 # hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider + +topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.internal.LegacyTopiaIdFactory Modified: trunk/wao-web/src/main/resources/shiro.ini =================================================================== --- trunk/wao-web/src/main/resources/shiro.ini 2014-01-24 14:14:56 UTC (rev 1679) +++ trunk/wao-web/src/main/resources/shiro.ini 2014-02-25 11:08:18 UTC (rev 1680) @@ -34,4 +34,8 @@ /struts/bootstrap/** = anon # pour tout le reste, il faut être authentifié -/** = authc +#/** = authc + +# on désactive shiro + +/** = anon Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-01-24 14:14:56 UTC (rev 1679) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-02-25 11:08:18 UTC (rev 1680) @@ -21,12 +21,74 @@ <body> - <header> - Plan d'échantillonnage - Contacts - Synthèses - </header> + <div class="navbar"> + <div class="navbar-inner"> + <a class="brand" href="#">Wao Obs???</a> + <ul class="nav"> + <li class="active"> + <s:url action="news" id="newsUrl" /> + <s:a href="%{newsUrl}" title="Consulter les actualités"> + Actualités + </s:a> + </li> + <li> + <s:url action="sampling-plan" id="samplingPlanUrl" /> + <s:a href="%{samplingPlanUrl}" title="Consulter le plan d'échantillonnage"> + Plan d'échantillonnage + </s:a> + </li> + <li> + <s:url action="boats" id="boatsUrl" /> + <s:a href="%{boatsUrl}" title="Consulter le référentiel de navires et créer des contacts"> + Navires + </s:a> + </li> + <li> + <s:url action="contacts" id="contactsUrl" /> + <s:a href="%{contactsUrl}" title="Consulter les contacts"> + Contacts + </s:a> + </li> + <li> + <s:url action="synthesis" id="synthesisUrl" /> + <s:a href="%{synthesisUrl}" title="Consulter les synthèses"> + Synthèses + </s:a> + </li> + </ul> + <ul class="nav pull-right"> + <li> + <s:url action="administration" id="administrationUrl" /> + <s:a href="%{administrationUrl}" title="Accèder à la partie administration"> + Administration + </s:a> + </li> + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + <i class="icon-cog"></i> + <b class="caret"></b> + </a> + <ul class="dropdown-menu"> + <li> + <a href="#"><i class="icon-flag"></i> Switch to english version</a> + </li> + <li> + <a href="#"><i class="icon-flag"></i> Basculer vers la version française</a> + </li> + <li class="divider" /> + <li> + <a href="#"><i class="icon-user"></i> Modifier votre profil</a> + </li> + <li> + <a href="#"><i class="icon-off"></i> Se déconnecter</a> + </li> + </ul> + </li> + </ul> + </div> + </div> + <content> <s:actionerror theme="bootstrap" /> <s:actionmessage theme="bootstrap" /> @@ -75,7 +137,7 @@ </ul> <t:if test="connectedUser.obsMer"> <p class="cnil"> - ${message:wao.ui.disclaimer} + <s:property value="text('wao.ui.disclaimer')" /> </p> </t:if> </footer>

1 0

Build failed in Jenkins: wao #1006
by admin+hudson＠codelutin.com 25 Jan '14

25 Jan '14

See <http://ci.nuiton.org/jenkins/job/wao/1006/changes> Changes: [Tony Chemit] create trunk ------------------------------------------ Started by an SCM change Building on master in workspace <http://ci.nuiton.org/jenkins/job/wao/ws/> Reverting <http://ci.nuiton.org/jenkins/job/wao/ws/trunk> to depth infinity with ignoreExternals: false Updating http://svn.forge.codelutin.com/svn/wao/trunk at revision '2014-01-10T08:43:08.799 +0100' D wao-business D LICENSE.txt D wao-ui D changelog.txt D src D pom.xml D README.txt D checkstyle.xml U . At revision 1675 Parsing POMs ERROR: No such file <http://ci.nuiton.org/jenkins/job/wao/ws/trunk/pom.xml> Perhaps you need to specify the correct POM file path in the project configuration?

1 3

r1679 - in trunk: . wao-services/src/main/resources wao-services/src/main/resources/i18n wao-web wao-web/src wao-web/src/main wao-web/src/main/java wao-web/src/main/java/fr wao-web/src/main/java/fr/ifremer wao-web/src/main/java/fr/ifremer/wao wao-web/src/main/java/fr/ifremer/wao/web wao-web/src/main/java/fr/ifremer/wao/web/action wao-web/src/main/java/fr/ifremer/wao/web/action/authentication wao-web/src/main/resources wao-web/src/main/resources/i18n wao-web/src/main/webapp wao-web/src/main/web
by bleny＠users.forge.codelutin.com 24 Jan '14

24 Jan '14

Author: bleny Date: 2014-01-24 15:14:56 +0100 (Fri, 24 Jan 2014) New Revision: 1679 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1679 Log: introduce wao-web module and parent pom Added: trunk/LICENSE.txt trunk/README.txt trunk/pom.xml trunk/wao-services/src/main/resources/i18n/ trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties trunk/wao-web/ trunk/wao-web/LICENSE.txt trunk/wao-web/README.txt trunk/wao-web/pom.xml trunk/wao-web/src/ trunk/wao-web/src/main/ trunk/wao-web/src/main/java/ trunk/wao-web/src/main/java/fr/ trunk/wao-web/src/main/java/fr/ifremer/ trunk/wao-web/src/main/java/fr/ifremer/wao/ trunk/wao-web/src/main/java/fr/ifremer/wao/web/ trunk/wao-web/src/main/java/fr/ifremer/wao/web/AuthenticatedWaoUser.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoWebApplicationContext.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationListener.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoPermissions.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoRealm.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/ trunk/wao-web/src/main/resources/ trunk/wao-web/src/main/resources/i18n/ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/resources/log4j.properties trunk/wao-web/src/main/resources/shiro.ini trunk/wao-web/src/main/resources/struts.properties trunk/wao-web/src/main/resources/struts.xml trunk/wao-web/src/main/resources/xwork-conversion.properties trunk/wao-web/src/main/webapp/ trunk/wao-web/src/main/webapp/WEB-INF/ trunk/wao-web/src/main/webapp/WEB-INF/content/ trunk/wao-web/src/main/webapp/WEB-INF/content/authentication/ trunk/wao-web/src/main/webapp/WEB-INF/content/authentication/login.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators.xml trunk/wao-web/src/main/webapp/WEB-INF/decorators/ 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/WEB-INF/decorators/version.jsp trunk/wao-web/src/main/webapp/WEB-INF/web.xml trunk/wao-web/src/test/ trunk/wao-web/src/test/java/ trunk/wao-web/src/test/resources/ Modified: trunk/ Property changes on: trunk ___________________________________________________________________ Added: svn:ignore + *.idea *.iml target Copied: trunk/LICENSE.txt (from rev 1675, tags/wao-3.4.1/LICENSE.txt) =================================================================== --- trunk/LICENSE.txt (rev 0) +++ trunk/LICENSE.txt 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 Affero 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/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:mergeinfo + /branches/wao-1.5.x/LICENSE.txt:679-733 Copied: trunk/README.txt (from rev 1675, tags/wao-3.4.1/README.txt) =================================================================== --- trunk/README.txt (rev 0) +++ trunk/README.txt 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,38 @@ +Launch application with winstone +-------------------------------- + +java -jar wao-xxx.war + +ou + +lancement à partir du script go.bat (pour Windows) + +Default admin user +------------------ + +login = admin +password = password + +Format des fichiers en CSV +-------------------------- + +Encodage UTF-8 obligatoire. Préconisation d'OpenOffice pour la sauvegarde des fichiers. + +Configuration au lancement +-------------------------- + +-Dwao.config.path=/path/to/properties/file (file named Wao.properties) +-Dwao.log.home=/path/to/log/folder + +Déploiement sous TOMCAT +----------------------- + +Il est nécessaire d'ajouter, dans /etc/default/tomcat : + +JAVA_OPTS="$JAVA_OPTS -XX:MaxPermSize=256M" + +Liens +----- + +Site du projet : https://labs.libre-entreprise.org/projects/suiviobsmer/ +Site de documentation : http://suiviobsmer.labs.libre-entreprise.org/wao/ Property changes on: trunk/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:mergeinfo + /branches/wao-1.5.x/README.txt:679-733 Added: trunk/pom.xml =================================================================== --- trunk/pom.xml (rev 0) +++ trunk/pom.xml 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,428 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>4.4</version> + </parent> + + <groupId>fr.ifremer</groupId> + <artifactId>wao</artifactId> + <version>4.0-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Wao</name> + <description>Application pour le suivi contractuels d'observations scientifiques de la pêche</description> + <url>http://maven-site.forge.codelutin.com/wao</url> + <inceptionYear>2009</inceptionYear> + <organization> + <name>Ifremer</name> + <url>http://www.ifremer.fr/</url> + </organization> + + <developers> + <developer> + <id>fdesbois</id> + <name>Florian Desbois</name> + <email>fdesbois(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Chef de Projet</role> + <role>Analyste</role> + <role>Développeur</role> + </roles> + </developer> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + <developer> + <name>Brendan Le Ny</name> + <id>bleny</id> + <email>bleny(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <name>Sylvain Letellier</name> + <id>sletellier</id> + <email>letellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <organizationUrl>http://www.codelutin.com</organizationUrl> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> + + <licenses> + <license> + <name>Affero General Public License (AGPL)</name> + <url>${maven.license.file}</url> + <distribution>local</distribution> + </license> + </licenses> + + <modules> + <module>wao-persistence</module> + <module>wao-services</module> + <module>wao-web</module> + </modules> + + <scm> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/wao/trunk</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/wao/trunk</url> + </scm> + + <properties> + + <license.licenseName>agpl_v3</license.licenseName> + +  + <platform>forge.codelutin.com</platform> + <projectId>wao</projectId> + +  + <h2Version>1.3.174</h2Version> + <struts2Version>2.3.15.3</struts2Version> + <jqueryPluginVersion>3.6.1</jqueryPluginVersion> + <bootstrapPluginVersion>1.6.1</bootstrapPluginVersion> + <shiroVersion>1.2.2</shiroVersion> + <slf4jVersion>1.7.5</slf4jVersion> + <hibernateVersion>4.2.8.Final</hibernateVersion> + <mockitoVersion>1.9.5</mockitoVersion> + <postgresqlDriverVersion>9.3-1100-jdbc41</postgresqlDriverVersion> + <commonsEmailVersion>1.3.2</commonsEmailVersion> + + <nuitonWebVersion>1.15-SNAPSHOT</nuitonWebVersion> + <nuitonI18nVersion>2.5.2</nuitonI18nVersion> + <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> + <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> + <eugeneVersion>2.7.3</eugeneVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> + +  + <locales>fr</locales> + +  + <devMode>true</devMode> + + <i18n.bundleOutputName>wao</i18n.bundleOutputName> + +  + <maven.compiler.source>1.7</maven.compiler.source> + <maven.compiler.target>1.7</maven.compiler.target> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> + </properties> + + <repositories> + <repository> + <id>wao-group</id> + <name>Wao dependencies</name> + <url>http://nexus.nuiton.org/nexus/content/groups/wao-group/</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>wao-nexus-repository</id> + <name>wao-nexus-repository</name> + <url>http://nexus.nuiton.org/nexus/content/groups/wao</url> + <snapshots> + <enabled>true</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + </releases> + </pluginRepository> + </pluginRepositories> + +  + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> + + <dependencyManagement> + + <dependencies> + +  + + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>${postgresqlDriverVersion}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>${nuitonConfigVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <version>${slf4jVersion}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>${log4jVersion}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + <version>${mockitoVersion}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + <version>${shiroVersion}</version> + <exclusions> +  + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> + </dependency> + +  + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-c3p0</artifactId> + <version>${hibernateVersion}</version> + <scope>runtime</scope> + </dependency> + +  + + <dependency> + <groupId>com.github.spullara.mustache.java</groupId> + <artifactId>compiler</artifactId> + <version>0.8.13</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + <version>${commonsEmailVersion}</version> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.8</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-csv</artifactId> + <version>${nuitonCsvVersion}</version> + </dependency> + +  + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + <version>${nuitonWebVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <version>3.0-alpha-2</version> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + <exclusions> +  + <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <version>${jqueryPluginVersion}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>com.jgeppert.struts2.bootstrap</groupId> + <artifactId>struts2-bootstrap-plugin</artifactId> + <version>${bootstrapPluginVersion}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-convention-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>${struts2Version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </exclusion> + +  + <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-web</artifactId> + <version>${shiroVersion}</version> + </dependency> + + </dependencies> + + </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + +  + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>eugene-maven-plugin</artifactId> + <version>${eugeneVersion}</version> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-templates</artifactId> + <version>${topiaVersion}</version> + </dependency> + </dependencies> + </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + </plugin> + </plugins> + </pluginManagement> + </build> + + <profiles> + <profile> + <id>disableDevModeProfile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <properties> + <devMode>false</devMode> + </properties> + </profile> + </profiles> + +</project> Property changes on: trunk/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: trunk/wao-services/src/main/resources/i18n/wao-services_en_GB.properties =================================================================== Added: trunk/wao-services/src/main/resources/i18n/wao-services_fr_FR.properties =================================================================== Property changes on: trunk/wao-web ___________________________________________________________________ Added: svn:ignore + *.iml .idea .settings target .project Copied: trunk/wao-web/LICENSE.txt (from rev 1675, tags/wao-3.4.1/wao-ui/LICENSE.txt) =================================================================== --- trunk/wao-web/LICENSE.txt (rev 0) +++ trunk/wao-web/LICENSE.txt 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 Affero 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/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: trunk/wao-web/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:mergeinfo + /branches/wao-1.5.x/wao-ui/LICENSE.txt:679-733 Added: trunk/wao-web/README.txt =================================================================== Added: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml (rev 0) +++ trunk/wao-web/pom.xml 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,261 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>fr.ifremer</groupId> + <artifactId>wao</artifactId> + <version>4.0-SNAPSHOT</version> + </parent> + + <artifactId>wao-web</artifactId> + <packaging>war</packaging> + + <name>Wao :: Web</name> + <description>Wao web Module</description> + + <properties> + <redmine.releaseFiles> + target/${project.build.finalName}.war + </redmine.releaseFiles> + + <deployFiles>target/${project.build.finalName}.war</deployFiles> + + <defaultWebContextPath>wao</defaultWebContextPath> + <defaultSiteUrl>http://localhost:8080/${defaultWebContextPath}</defaultSiteUrl> + +  + <skipPostRelease>false</skipPostRelease> + +  + <slf4jJclScope>runtime</slf4jJclScope> + </properties> + + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wao-persistence</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wao-services</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + </dependency> + + <dependency> + <groupId>com.jgeppert.struts2.bootstrap</groupId> + <artifactId>struts2-bootstrap-plugin</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-convention-plugin</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-web</artifactId> + </dependency> + +  +  +  +  +  +  +  + +  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>${slf4jJclScope}</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> + + </dependencies> + + <build> + <finalName>wao-${project.version}</finalName> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <configuration> + <path>/${defaultWebContextPath}</path> + <systemProperties> + <siteUrl>${defaultSiteUrl}</siteUrl> + </systemProperties> + <uriEncoding>UTF-8</uriEncoding> + </configuration> + </plugin> + + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <id>parseJsp</id> + <goals> + <goal>parserStruts2</goal> + </goals> + <configuration> + <acceptKeyFormat>^wao\..*$</acceptKeyFormat> + </configuration> + </execution> + <execution> + <id>parseOthersAndGen</id> + <configuration> + <entries> + <entry> + <specificGoal>parserValidation</specificGoal> + <basedir>${maven.src.dir}/main/java/</basedir> + <includes> + <param>**/**-validation.xml</param> + </includes> + </entry> + </entries> + </configuration> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/main/webapp/WEB-INF/decorators</directory> + <targetPath>WEB-INF/decorators</targetPath> + <includes> + <include>version.jsp</include> + </includes> + <filtering>true</filtering> + </resource> + </webResources> + </configuration> + </plugin> + + </plugins> + </build> + +  + <profiles> + <profile> + <id>removeSlf4jJclFromClasspath</id> + <properties> + <slf4jJclScope>provided</slf4jJclScope> + </properties> + </profile> + </profiles> +</project> Property changes on: trunk/wao-web/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/AuthenticatedWaoUser.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/AuthenticatedWaoUser.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/AuthenticatedWaoUser.java 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,41 @@ +package fr.ifremer.wao.web; + +import fr.ifremer.wao.entity.WaoUser; +import org.apache.shiro.SecurityUtils; +import org.apache.shiro.subject.Subject; + +public class AuthenticatedWaoUser { + + protected WaoUser waoUser; + + protected transient WaoPermissions permissions; + + public AuthenticatedWaoUser(WaoUser waoUser) { + this.waoUser = waoUser; + } + + protected WaoPermissions getPermissions() { + if (permissions == null) { + permissions = new WaoPermissions(); + } + return permissions; + } + + protected boolean isPermitted(String permission) { + return getCurrentUser().isPermitted(permission); + } + + protected Subject getCurrentUser() { + Subject currentUser = SecurityUtils.getSubject(); + return currentUser; + } + + public WaoUser getWaoUser() { + return waoUser; + } + + public void logout() { + getCurrentUser().logout(); + } + +} Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoWebApplicationContext.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoWebApplicationContext.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/DefaultWaoWebApplicationContext.java 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,77 @@ +package fr.ifremer.wao.web; + +/* + * #%L + * Extranet ENC-AHI :: Web + * $Id: DefaultWaoWebApplicationContext.java 827 2013-12-04 15:30:35Z bleny $ + * $HeadURL: http://svn.forge.codelutin.com/svn/extranet-enc-ahi/trunk/extranet-web/src/… $ + * %% + * Copyright (C) 2013 Ministère des Affaires sociales et de la Santé + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import com.google.common.base.Charsets; +import com.google.common.base.Joiner; +import com.google.common.collect.Sets; +import fr.ifremer.wao.WaoTechnicalException; +import fr.ifremer.wao.services.WaoWebApplicationContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Collections; +import java.util.Map; +import java.util.SortedSet; + +public class DefaultWaoWebApplicationContext implements WaoWebApplicationContext { + + private static final Log log = LogFactory.getLog(DefaultWaoWebApplicationContext.class); + + protected String instanceUrl; + + public DefaultWaoWebApplicationContext(String instanceUrl) { + this.instanceUrl = instanceUrl; + } + + protected String formatUrl(String actionUrl) { + Map<String, String> emptyMap = Collections.emptyMap(); + return formatUrl(actionUrl, emptyMap); + } + + protected String formatUrl(String actionUrl, Map<String, String> parameters) { + StringBuilder stringBuilder = new StringBuilder(); + stringBuilder.append(instanceUrl).append("/").append(actionUrl); + if ( ! parameters.isEmpty()) { + SortedSet<String> queryStringElements = Sets.newTreeSet(); + try { + for (Map.Entry<String, String> parameter : parameters.entrySet()) { + String queryStringElement = parameter.getKey() + '=' + URLEncoder.encode(parameter.getValue(), Charsets.UTF_8.name()); + queryStringElements.add(queryStringElement); + } + } catch (UnsupportedEncodingException e) { + if (log.isErrorEnabled()) { + log.error("should never occur", e); + } + throw new WaoTechnicalException(e); + } + stringBuilder.append('?').append(Joiner.on('&').join(queryStringElements)); + } + return stringBuilder.toString(); + } + +} Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoActionSupport.java 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,36 @@ +package fr.ifremer.wao.web; + +import fr.ifremer.wao.WaoApplicationConfig; +import org.apache.struts2.convention.annotation.Result; +import org.apache.struts2.convention.annotation.Results; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.web.struts2.BaseAction; + +public class WaoActionSupport extends BaseAction { + + protected WaoApplicationConfig applicationConfig; + + protected WaoSession session; + + public void setApplicationConfig(WaoApplicationConfig applicationConfig) { + this.applicationConfig = applicationConfig; + } + + public WaoApplicationConfig getApplicationConfig() { + return applicationConfig; + } + + protected WaoSession getSession() { + return session; + } + + public String getInstanceDisclaimer() { + return applicationConfig.getInstanceDisclaimer(); + } + + + public void setSession(WaoSession session) { + this.session = session; + } + +} Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationContext.java 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,135 @@ +package fr.ifremer.wao.web; + +import com.opensymphony.xwork2.util.LocalizedTextUtil; +import fr.ifremer.wao.WaoApplicationConfig; +import fr.ifremer.wao.WaoTopiaApplicationContext; +import fr.ifremer.wao.WaoTopiaPersistenceContext; +import fr.ifremer.wao.services.DefaultWaoServiceContext; +import fr.ifremer.wao.services.WaoServiceContext; +import fr.ifremer.wao.services.WaoWebApplicationContext; +import fr.ifremer.wao.services.service.InitWaoService; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.log4j.LogManager; +import org.apache.log4j.PropertyConfigurator; +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.DefaultI18nInitializer; +import org.nuiton.i18n.init.I18nInitializer; + +import java.io.File; +import java.util.Locale; + +public class WaoApplicationContext { + + private static Log log = LogFactory.getLog(WaoApplicationContext.class); + + public static final String APPLICATION_CONTEXT_PARAMETER = "WaoApplicationContext"; + + protected static WaoTopiaApplicationContext topiaApplicationContext; + + protected static WaoApplicationConfig applicationConfig; + + public static WaoApplicationConfig getApplicationConfig() { + if (applicationConfig == null) { + applicationConfig = new WaoApplicationConfig(); + } + return applicationConfig; + } + + public static WaoTopiaApplicationContext getTopiaApplicationContext() { + if (topiaApplicationContext == null) { + topiaApplicationContext = new WaoTopiaApplicationContext(getApplicationConfig().getTopiaProperties()); + } + return topiaApplicationContext; + } + + public WaoTopiaPersistenceContext newPersistenceContext() { + + WaoTopiaPersistenceContext persistenceContext = getTopiaApplicationContext().newPersistenceContext(); + + return persistenceContext; + + } + + public WaoServiceContext newServiceContext(WaoTopiaPersistenceContext persistenceContext) { + + DefaultWaoServiceContext newServiceContext = + new DefaultWaoServiceContext(); + + WaoApplicationConfig applicationConfig = getApplicationConfig(); + + newServiceContext.setApplicationConfig(applicationConfig); + + newServiceContext.setPersistenceContext(persistenceContext); + + WaoWebApplicationContext webApplicationContext = + new DefaultWaoWebApplicationContext(applicationConfig.getInstanceUrl()); + + newServiceContext.setWebApplicationContext(webApplicationContext); + + return newServiceContext; + + } + + public void close() { + + if (topiaApplicationContext != null) { + + topiaApplicationContext.closeContext(); + + } + + } + + public void init() { + + if (getApplicationConfig().isLogConfigurationProvided()) { + + File log4jConfigurationFile = getApplicationConfig().getLogConfigurationFile(); + + String log4jConfigurationFileAbsolutePath = log4jConfigurationFile.getAbsolutePath(); + + if (log4jConfigurationFile.exists()) { + + if (log.isInfoEnabled()) { + log.info("will use logging configuration " + log4jConfigurationFileAbsolutePath); + } + + // reset logger configuration + LogManager.resetConfiguration(); + + // use generate log config file + PropertyConfigurator.configure(log4jConfigurationFileAbsolutePath); + + log = LogFactory.getLog(WaoApplicationContext.class); + + } else { + if (log.isWarnEnabled()) { + log.warn("there is no file " + log4jConfigurationFileAbsolutePath + ". Default logging configuration will be used."); + } + } + + } else { + log.info("will use default logging configuration"); + } + + I18nInitializer initializer = new DefaultI18nInitializer("wao"); + + I18n.init(initializer, Locale.FRANCE); + + LocalizedTextUtil.addDefaultResourceBundle("i18n.wao-web"); + + WaoTopiaPersistenceContext persistenceContext = newPersistenceContext(); + + WaoServiceContext serviceContext = newServiceContext(persistenceContext); + + InitWaoService initWaoService = + serviceContext.newService(InitWaoService.class); + + initWaoService.init(); + + persistenceContext.closeContext(); + + } + +} Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationListener.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationListener.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoApplicationListener.java 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,43 @@ +package fr.ifremer.wao.web; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; + +public class WaoApplicationListener implements ServletContextListener { + + private static final Log log = LogFactory.getLog(WaoApplicationListener.class); + + protected WaoApplicationContext applicationContext; + + @Override + public void contextInitialized(ServletContextEvent sce) { + + if (log.isInfoEnabled()) { + log.info("init WAO"); + } + + applicationContext = new WaoApplicationContext(); + + applicationContext.init(); + + sce.getServletContext().setAttribute( + WaoApplicationContext.APPLICATION_CONTEXT_PARAMETER, + applicationContext); + + } + + @Override + public void contextDestroyed(ServletContextEvent sce) { + + if (log.isInfoEnabled()) { + log.info("stop WAO"); + } + + applicationContext.close(); + + } + +} Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoInterceptor.java 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,180 @@ +package fr.ifremer.wao.web; + +import com.google.common.base.Preconditions; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.Interceptor; +import fr.ifremer.wao.WaoApplicationConfig; +import fr.ifremer.wao.WaoTopiaPersistenceContext; +import fr.ifremer.wao.services.WaoService; +import fr.ifremer.wao.services.WaoServiceContext; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.beans.BeanUtil; + +import java.beans.PropertyDescriptor; +import java.util.Set; + +public class WaoInterceptor implements Interceptor { + + private static final Log log = LogFactory.getLog(WaoInterceptor.class); + + public static final String SESSION_LAST_LOCATION = "lastLocation"; + + @Override + public void init() { + + if (log.isInfoEnabled()) { + log.info("init " + this); + } + + } + + @Override + public String intercept(ActionInvocation invocation) throws Exception { + + Object action = invocation.getAction(); + + if (action instanceof WaoActionSupport) { + + WaoActionSupport encAhiAction = (WaoActionSupport) action; + + WaoServiceContext serviceContext = newServiceContext(invocation); + + WaoSession waoSession = getWaoSession(invocation); + + if (CollectionUtils.isNotEmpty(waoSession.getMessages())) { + + for (String message : waoSession.getMessages()) { + + encAhiAction.addActionMessage(message); + + } + + waoSession.getMessages().clear(); + + } + + if (CollectionUtils.isNotEmpty(waoSession.getErrorMessages())) { + + for (String message : waoSession.getErrorMessages()) { + + encAhiAction.addActionError(message); + + } + + waoSession.getErrorMessages().clear(); + + } + + Set<PropertyDescriptor> descriptors = + BeanUtil.getDescriptors( + action.getClass(), + BeanUtil.IS_WRITE_DESCRIPTOR); + + for (PropertyDescriptor propertyDescriptor : descriptors) { + + Class<?> propertyType = propertyDescriptor.getPropertyType(); + + Object toInject = null; + + if (WaoService.class.isAssignableFrom(propertyType)) { + + Class<? extends WaoService> serviceClass = + (Class<? extends WaoService>) propertyType; + + toInject = serviceContext.newService(serviceClass); + + } else if (WaoSession.class.isAssignableFrom(propertyType)) { + + toInject = waoSession; + + } else if (WaoApplicationConfig.class.isAssignableFrom(propertyType)) { + + toInject = getWaoApplicationContext(invocation).getApplicationConfig(); + + } + + if (toInject != null) { + + if (log.isTraceEnabled()) { + log.trace("injecting " + toInject + " in action " + action); + } + + propertyDescriptor.getWriteMethod().invoke(action, toInject); + + } + } + + try { + + return invocation.invoke(); + + } finally { + + serviceContext.getPersistenceContext().closeContext(); + + } + + } else { + + return invocation.invoke(); + + } + + } + + protected WaoSession getWaoSession(ActionInvocation invocation) { + + WaoSession session = (WaoSession) invocation.getInvocationContext().getSession().get(WaoSession.SESSION_PARAMETER); + + if (session == null) { + + session = new WaoSession(); + + invocation.getInvocationContext().getSession().put(WaoSession.SESSION_PARAMETER, session); + + } + + return session; + + } + + protected WaoApplicationContext getWaoApplicationContext(ActionInvocation invocation) { + + WaoApplicationContext applicationContext = + (WaoApplicationContext) invocation + .getInvocationContext() + .getApplication() + .get(WaoApplicationContext.APPLICATION_CONTEXT_PARAMETER); + + Preconditions.checkNotNull(applicationContext, + "application context must be initialized before calling an action"); + + return applicationContext; + + } + + protected WaoServiceContext newServiceContext(ActionInvocation invocation) { + + WaoApplicationContext waoApplicationContext = getWaoApplicationContext(invocation); + + WaoTopiaPersistenceContext persistenceContext = waoApplicationContext.newPersistenceContext(); + + WaoServiceContext serviceContext = + waoApplicationContext.newServiceContext(persistenceContext); + + return serviceContext; + + } + + @Override + public void destroy() { + + if (log.isInfoEnabled()) { + log.info("destroy " + this); + } + + } + +} Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoPermissions.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoPermissions.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoPermissions.java 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,52 @@ +package fr.ifremer.wao.web; + +import com.google.common.collect.Iterables; +import fr.ifremer.wao.WaoTopiaPersistenceContext; +import fr.ifremer.wao.entity.WaoUser; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.persistence.TopiaEntities; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.HashSet; +import java.util.Set; + +/** + * Représente tout le système de permissions de l'extranet. + */ +public class WaoPermissions { + + private static final Log log = LogFactory.getLog(WaoPermissions.class); + + protected <E extends TopiaEntity> String getTopiaIds(Iterable<E> topiaEntities) { + Iterable<String> topiaIds = Iterables.transform(topiaEntities, TopiaEntities.getTopiaIdFunction()); + return join(topiaIds); + } + + protected String join(Iterable<String> topiaIds) { + return StringUtils.join(topiaIds, ','); + } + + /** + * Permet d'obtenir toutes les permissions accordée à l'utilisateur donné. + */ + public Set<String> getPermissions(WaoTopiaPersistenceContext topiaPersistenceContext, WaoUser waoUser) { + + Set<String> permissions = new HashSet<>(); + + if (waoUser.isActive()) { + + + + } + + if (log.isDebugEnabled()) { + log.debug("permissions for " + waoUser + " are " + permissions); + } + + return permissions; + + } + +} Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoRealm.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoRealm.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoRealm.java 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,180 @@ +package fr.ifremer.wao.web; + +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import fr.ifremer.wao.WaoTechnicalException; +import fr.ifremer.wao.WaoTopiaApplicationContext; +import fr.ifremer.wao.WaoTopiaPersistenceContext; +import fr.ifremer.wao.entity.WaoUser; +import fr.ifremer.wao.entity.WaoUserTopiaDao; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.shiro.authc.AuthenticationException; +import org.apache.shiro.authc.AuthenticationInfo; +import org.apache.shiro.authc.AuthenticationToken; +import org.apache.shiro.authc.LockedAccountException; +import org.apache.shiro.authc.SimpleAccount; +import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.authc.credential.CredentialsMatcher; +import org.apache.shiro.authz.AuthorizationInfo; +import org.apache.shiro.authz.SimpleAuthorizationInfo; +import org.apache.shiro.realm.AuthorizingRealm; +import org.apache.shiro.subject.PrincipalCollection; + +import java.util.Set; + +public class WaoRealm extends AuthorizingRealm { + + private static final Log log = LogFactory.getLog(WaoRealm.class); + + protected static final CredentialsMatcher CREDENTIALS_MATCHER = new WaoCredentialsMatcher(); + + protected WaoPermissions permissions = new WaoPermissions(); + + protected WaoTopiaApplicationContext topiaApplicationContext; + + public WaoRealm() { + super(CREDENTIALS_MATCHER); + this.topiaApplicationContext = WaoApplicationContext.getTopiaApplicationContext(); + } + + @Override + protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token) throws AuthenticationException { + + WaoTopiaPersistenceContext persistenceContext = null; + + try { + + UsernamePasswordToken usernamePasswordToken = (UsernamePasswordToken) token; + String email = usernamePasswordToken.getUsername(); + + persistenceContext = topiaApplicationContext.newPersistenceContext(); + WaoUserTopiaDao waoUserDao = persistenceContext.getWaoUserDao(); + + Optional<WaoUser> waoUserOptional = waoUserDao.tryFindByEmailAndFetchCollections(email); + + AuthenticationInfo authenticationInfo; + if (waoUserOptional.isPresent()) { + + WaoUser waoUser = waoUserOptional.get(); + + if (waoUser.isActive()) { + authenticationInfo = new WaoAuthenticationInfo(getName(), waoUser); + } else { + throw new LockedAccountException(); + } + + } else { + authenticationInfo = null; // If the user doesn't exists, the contract asks us to return null + } + + return authenticationInfo; + + } finally { + + if (persistenceContext != null) { + persistenceContext.closeContext(); + } + + } + + } + + @Override + protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principalCollection) { + + SimpleAuthorizationInfo authorizationInfo; + + Object primaryPrincipal = principalCollection.getPrimaryPrincipal(); + + if (primaryPrincipal instanceof WaoUser) { + + WaoUser waoUser = (WaoUser) primaryPrincipal; + + authorizationInfo = new SimpleAuthorizationInfo(); + + WaoTopiaPersistenceContext persistenceContext = null; + try { + persistenceContext = topiaApplicationContext.newPersistenceContext(); + Set<String> waoUserPermissions = permissions.getPermissions(persistenceContext, waoUser); + authorizationInfo.addStringPermissions(waoUserPermissions); + } finally { + if (persistenceContext != null) { + persistenceContext.closeContext(); + } + } + + } else { + throw new WaoTechnicalException("unable to get wao user from " + principalCollection); + } + + return authorizationInfo; + + } + + /** + * Notre implémentation de {@link org.apache.shiro.authc.AuthenticationInfo}, comme + * on a pas vraiment de Principal, on utilise waoUser directement. + */ + protected static class WaoAuthenticationInfo extends SimpleAccount { + + protected WaoUser waoUser; + + public WaoAuthenticationInfo(String realmName, WaoUser waoUser) { + super(waoUser, waoUser, realmName); + Preconditions.checkNotNull(waoUser); + this.waoUser = waoUser; + } + + public WaoUser getWaoUser() { + return waoUser; + } + } + + /** + * Notre implémentation de {@link org.apache.shiro.authc.credential.CredentialsMatcher}, elle + * compare le mot de passe proposé en utilisant la bonne fonction hash et le bon salt. + */ + protected static class WaoCredentialsMatcher implements CredentialsMatcher { + + private static final Log log = LogFactory.getLog(WaoCredentialsMatcher.class); + + @Override + public boolean doCredentialsMatch(AuthenticationToken token, AuthenticationInfo info) { + + boolean passwordMatches; + + if (info instanceof WaoAuthenticationInfo) { + + WaoUser waoUser = ((WaoAuthenticationInfo) info).getWaoUser(); + +// char[] tokenCredentials = (char[]) token.getCredentials(); +// String clearPassword = new String(tokenCredentials); +// +// Double hashSalt = waoUser.getHashSalt(); +// +// Preconditions.checkNotNull(hashSalt); +// +// String saltedPassword = clearPassword + hashSalt; +// +// String hashedPassword = DigestUtils.sha1Hex(saltedPassword); +// +// passwordMatches = waoUser.getHashedPassword().equals(hashedPassword); + + // TODO brendan 14/01/14 implementer le check de password + + passwordMatches = true; + + } else { + if (log.isWarnEnabled()) { + log.warn("unable to deal with authenticationInfo " + info); + } + passwordMatches = false; + } + + return passwordMatches; + + } + + } +} Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoSession.java 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,53 @@ +package fr.ifremer.wao.web; + +import com.google.common.collect.Lists; + +import java.io.Serializable; +import java.util.Collection; + +public class WaoSession implements Serializable { + + public static final String SESSION_PARAMETER = "waoSession"; + + protected Collection<String> messages; + + protected Collection<String> errorMessages; + + protected AuthenticatedWaoUser authenticatedWaoUser; + + public Collection<String> getMessages() { + if (messages == null) { + messages = Lists.newLinkedList(); + } + return messages; + } + + public void addMessage(String message) { + getMessages().add(message); + } + + public Collection<String> getErrorMessages() { + if (errorMessages == null) { + errorMessages = Lists.newLinkedList(); + } + return errorMessages; + } + + public void addErrorMessages(String errorMessage) { + getErrorMessages().add(errorMessage); + } + + public void logout() { + authenticatedWaoUser.logout(); + authenticatedWaoUser = null; + } + + public AuthenticatedWaoUser getAuthenticatedWaoUser() { + return authenticatedWaoUser; + } + + public void setAuthenticatedWaoUser(AuthenticatedWaoUser authenticatedWaoUser) { + this.authenticatedWaoUser = authenticatedWaoUser; + } + +} Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/WaoStrutsObjectFactory.java 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,67 @@ +package fr.ifremer.wao.web; + +/* + * #%L + * Extranet ENC-AHI :: Web + * $Id: ExtranetEncAhiStrutsObjectFactory.java 827 2013-12-04 15:30:35Z bleny $ + * $HeadURL: http://svn.forge.codelutin.com/svn/extranet-enc-ahi/trunk/extranet-web/src/… $ + * %% + * Copyright (C) 2013 Ministère des Affaires sociales et de la Santé + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import fr.ifremer.wao.WaoEntityEnum; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.impl.StrutsObjectFactory; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.Map; + +public class WaoStrutsObjectFactory extends StrutsObjectFactory { + + private static final Log log = LogFactory.getLog(WaoStrutsObjectFactory.class); + + @Override + public Object buildBean(Class clazz, Map<String, Object> extraContext) throws Exception { + + Object instance; + + if (TopiaEntity.class.isAssignableFrom(clazz)) { + + if (log.isTraceEnabled()) { + log.trace(" new instance of " + clazz.getCanonicalName()); + } + + WaoEntityEnum waoEntityEnum = + WaoEntityEnum.valueOf(clazz); + + Class<? extends TopiaEntity> implementation = + waoEntityEnum.getImplementation(); + + instance = implementation.newInstance(); + + } else { + + instance = clazz.newInstance(); + + } + + return instance; + } + +} Added: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java (rev 0) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/authentication/LoginAction.java 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,12 @@ +package fr.ifremer.wao.web.action.authentication; + +import fr.ifremer.wao.web.WaoActionSupport; + +public class LoginAction extends WaoActionSupport { + + @Override + public String execute() { + return INPUT; + } + +} Copied: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties (from rev 1675, tags/wao-3.4.1/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties) =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties (rev 0) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,351 @@ +ObservedDataControl.ACCEPTED=Accepted +ObservedDataControl.CORRECTION_ASKED=Correction asked +StrategyValues.CONTACTS_STATES=Contact states by boat district +StrategyValues.CONTACTS_STATES_MOTIFS=Refusal motives +StrategyValues.CONTACTS_STATES_SEABOARDS=Contact states by seaboard +SynthesisId.DISTINCT_BOATS_COUNTS= +SynthesisId.GRAPH_BOARDING= +SynthesisId.GRAPH_SAMPLING= +SynthesisId.IND_ALLEGRO_REACTIVITY= +SynthesisId.IND_COMPLIANCE_BOARDING= +SynthesisId.IND_CONTACT_STATE= +SynthesisId.IND_DATA_RELIABILITY= +SynthesisId.OBSERVATION_HOUR= +cgu= +wao.ui.acceptCgu=I've read and accept the terms of use +wao.ui.action.acceptContact=Validate contact +wao.ui.action.add=Add +wao.ui.action.addNewContactFromBoat=Create a new contact for this boat and the selected sample row (in filters) +wao.ui.action.back=Back to previous screen +wao.ui.action.cancel=Cancel +wao.ui.action.changeLocale=Change language +wao.ui.action.contactAdmin=Contact an admin +wao.ui.action.create=Create +wao.ui.action.createCompany=Create a company +wao.ui.action.createUser=Create a user +wao.ui.action.delete=Delete +wao.ui.action.deleteCompany=Delete company +wao.ui.action.deleteCompany.confirm=Are you sure you want to delete this company ? +wao.ui.action.deleteContact=Delete contact +wao.ui.action.deleteContact.confirm=Are you sure you want to delete this contact ? +wao.ui.action.deleteNews=Delete this news +wao.ui.action.deleteNews.confirm=Are you sure you want to delete this news ? +wao.ui.action.deleteSampleRow=Delete this sample row +wao.ui.action.deleteSampleRow.confirm=Are you sure your want to delete this sample row ? +wao.ui.action.deleteUser=Delete this user +wao.ui.action.deleteUser.confirm=Are your sure you want to delete this user ? +wao.ui.action.edit=Edit +wao.ui.action.enlargeView=Enlarge view +wao.ui.action.exportBoats=Export boats with private infos +wao.ui.action.filter=Filter +wao.ui.action.hideFilters=Hide filters +wao.ui.action.login=Connection +wao.ui.action.logout=Logout +wao.ui.action.reduceView=Reduce view +wao.ui.action.refresh=Refresh +wao.ui.action.refuseContact=Refuse contact +wao.ui.action.remove=Remove +wao.ui.action.resetFields=Reset form +wao.ui.action.revert=Revert +wao.ui.action.runExport=Run export +wao.ui.action.runImport=Run import +wao.ui.action.runSearch=Run search +wao.ui.action.save=Save +wao.ui.action.showDetails=Show details +wao.ui.action.showFilters=Show filters +wao.ui.action.unvalidateContact=Unvalidate contact +wao.ui.action.viewBoatsForRow=View the boats for this sample row +wao.ui.action.viewIndicatorsHistory=View indicators historic +wao.ui.boatList=List of %s boats +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.boats.portOfRegistry.description=It's the main operating port of the boat +wao.ui.boats.portOfRegistry.header=Port +wao.ui.boats.selecting=You are currently selecting a boat for the row %s +wao.ui.boats.substitutes=Substitutes for this boat +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 +wao.ui.chart.numberBoats=No. boats +wao.ui.chart.numberObservations=No. observations +wao.ui.chart.numberOfBoatsWithBoardings=Number of boats with x observations +wao.ui.chooseUserProfile=Choose your user profile +wao.ui.contact.lastContact=Last observation with this boat for your company +wao.ui.contacts.createFromBoat=Create a new contact for this boat and this sample row +wao.ui.contacts.createFromBoat.fail=Contact creation failed +wao.ui.contacts.createFromBoat.warn=Warning \:this sample-row is out of date, are your sure you want to create a new contact ? +wao.ui.disclaimer=The website "SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER" is declared to the CNIL with the number \: 1414476 +wao.ui.disclaimer.boats=Data your provide remains property of your company.Outside your company, only an administrator may access to your data for maintenance purpose. The administrator is someone from Ifremer. +wao.ui.email=e-mail address +wao.ui.entity.Boat=Boat +wao.ui.entity.Boats=Boats +wao.ui.entity.Company=Company +wao.ui.entity.Contact=Contact +wao.ui.entity.FishingZone=Fishing zones +wao.ui.entity.SampleRow=Sample row +wao.ui.entity.SampleRow.day= +wao.ui.entity.TerrestrialLocation=Place +wao.ui.entity.fishingGearDCF=Gear DCF code +wao.ui.entity.targetSpeciesDCF=Target species DCF code +wao.ui.field.Boat.boatGroup=Boat group +wao.ui.field.Boat.boatLength=Length +wao.ui.field.Boat.buildYear=Build year +wao.ui.field.Boat.district=Boat district +wao.ui.field.Boat.districtCode=District oode +wao.ui.field.Boat.fleet=Fleet +wao.ui.field.Boat.immatriculation=Registration number +wao.ui.field.Boat.name=Name +wao.ui.field.Boat.portOfRegistry=Port of registry +wao.ui.field.Boat.shipOwner=Shipowner +wao.ui.field.BoatDistrict.code=District code +wao.ui.field.BoatInfos.dup=Capacity of the ship in specialized staff +wao.ui.field.Company.active=Active +wao.ui.field.Company.name=Name +wao.ui.field.Contact.beginDate=Observation start +wao.ui.field.Contact.comment=Observer comment +wao.ui.field.Contact.commentAdmin=Program comment +wao.ui.field.Contact.commentCoordinator=Coordinator comment +wao.ui.field.Contact.completeSampling=Complete sampling +wao.ui.field.Contact.contactState=Contact state +wao.ui.field.Contact.contactStateMotif=Refusal motif +wao.ui.field.Contact.contactStateMotifs=Refusal motives +wao.ui.field.Contact.creationDate=Contact creation date +wao.ui.field.Contact.dataInputDate=Data input date +wao.ui.field.Contact.dataReliability=Data reliability +wao.ui.field.Contact.endDate=Observation end +wao.ui.field.Contact.landingDate=Landing date and time +wao.ui.field.Contact.mainObserver=Main observer +wao.ui.field.Contact.mammalsCapture=Accidental capture +wao.ui.field.Contact.mammalsInfo=Scientific names and number of captured species +wao.ui.field.Contact.mammalsObservation=Exceptional observation +wao.ui.field.Contact.nbObservants=Observers number +wao.ui.field.Contact.obsDebCode=Profession +wao.ui.field.Contact.observationType=Observation type +wao.ui.field.Contact.observedDataControl=Observed data control +wao.ui.field.Contact.restitution=Restitution forwarding date +wao.ui.field.Contact.samplingStrategy=Sampling strategy followed +wao.ui.field.Contact.secondaryObservers=Observers +wao.ui.field.Contact.terrestrialLocation=Observation's place +wao.ui.field.Contact.validationCompany=Company validation +wao.ui.field.Contact.validationProgram=Program validation +wao.ui.field.FishingZone.facadeName=Facade +wao.ui.field.FishingZone.sectorName=Sector +wao.ui.field.SampleRow.appliedCoverageRate=Applied coverage rate +wao.ui.field.SampleRow.boat=Boat +wao.ui.field.SampleRow.code=Line code +wao.ui.field.SampleRow.comment=Comment +wao.ui.field.SampleRow.company=Company +wao.ui.field.SampleRow.dCF5Code=DCF5 Codes +wao.ui.field.SampleRow.day=Day +wao.ui.field.SampleRow.dcf5Code=DCF5 code +wao.ui.field.SampleRow.expectedDate=Date +wao.ui.field.SampleRow.fishingZones=Fishing zone(s) +wao.ui.field.SampleRow.libelle=Labels +wao.ui.field.SampleRow.meshSize=Mesh size +wao.ui.field.SampleRow.observationType=Observation type +wao.ui.field.SampleRow.observationUnit=Observation unit +wao.ui.field.SampleRow.observers=Observers +wao.ui.field.SampleRow.other=Other +wao.ui.field.SampleRow.periodBegin=Begin +wao.ui.field.SampleRow.periodEnd=End +wao.ui.field.SampleRow.profession=Profession +wao.ui.field.SampleRow.professionCode=Profession code +wao.ui.field.SampleRow.programName=Program +wao.ui.field.SampleRow.regionIfremer=Region +wao.ui.field.SampleRow.samplingStrategy=Sampling strategy +wao.ui.field.SampleRow.size=Boat size +wao.ui.field.SampleRow.species=Species +wao.ui.field.SampleRow.terrestrialLocation=Maritime district +wao.ui.field.SampleRow.terrestrialLocationInfos=Terrestrial Location Infos +wao.ui.field.SampleRow.terrestrialLocations=Maritimes districts +wao.ui.field.TerrestrialDivision.regionIfremer=Ifremer region +wao.ui.field.TerrestrialDivision.skillZone=Skill zone +wao.ui.field.TerrestrialDivision.subPopulation=Sub-population +wao.ui.field.User.firstName=First name +wao.ui.field.User.lastName=Last name +wao.ui.field.User.login=Login +wao.ui.field.UserProfile.userRole=Role +wao.ui.field.WaoUser.canReadBoats=Restraint view to boats +wao.ui.field.WaoUser.login=Identifier +wao.ui.field.WaoUser.mammalsNotifications=Receive notifications about mammals captures +wao.ui.field.WaoUser.password=Password +wao.ui.filters.filters=Search filters +wao.ui.filters.refresh=Refresh filters +wao.ui.forgotPassword=Forgot password ? +wao.ui.form.SampleRow.boatsDescription=This field contains registration numbers of the ships that areeligible for this ligne. You can use any separator to separate numbers (space, dot, line-return, comma) +wao.ui.form.SampleRow.error.missingLogComment=You must add a comment to explain why you modified the line +wao.ui.form.SampleRow.missingBeginDate=Begin date missing to generate line code +wao.ui.form.SampleRow.others=Others data of the sample row +wao.ui.form.SampleRow.program=Associated program and observation effort by months +wao.ui.form.addComment=Add a comment +wao.ui.form.addRole=Add this ru00F4le +wao.ui.form.boardingFrom=Boardings since +wao.ui.form.contactsFile=Contacts file +wao.ui.form.definePasswordManually=Define password manually +wao.ui.form.editComment=Edit comment +wao.ui.form.editionAuthor=Modification's author +wao.ui.form.estimatedTides=View estimated effort +wao.ui.form.estimatedTides.description=The estimated observation effort is the number of contact that are validated by the company or not. Contacts refused by program are ignored. +wao.ui.form.filterOnObservationBeginDate=Filter contacts on the observation begin date +wao.ui.form.generatePassword=Generate password +wao.ui.form.mapType=Map +wao.ui.form.otherBoatInfos=Other boat infos +wao.ui.form.period=Period +wao.ui.form.period.from=from +wao.ui.form.period.to=to +wao.ui.form.periodFrom=Period from +wao.ui.form.periodFromTo=Period from %s to %s +wao.ui.form.program=Program +wao.ui.form.programEvaluation=Program evaluation +wao.ui.form.readOnly=read-only +wao.ui.form.removeRole=remove this role +wao.ui.form.repeatPassword=Repeat password +wao.ui.form.roles=Roles +wao.ui.form.sortByTideBegin=Sort by observation begin date +wao.ui.import.boatDistrictLabel=of the coordinates of boat districts +wao.ui.import.boatGroupsLabel=of the boat groups +wao.ui.import.boatsLabel=of boats +wao.ui.import.contactStateMotivesLabel=of the contact state motives +wao.ui.import.description=File %s %s \: +wao.ui.import.fishingZoneLabel=of fishing zones +wao.ui.import.fullDescription=Import %s (%s format with UTF-8 characters set) +wao.ui.import.longTitle=CSV Import/Export (UTF-8) +wao.ui.import.obsDebCodesLabel=of the ObsDeb profession codes +wao.ui.import.samplingPlanLabel=of the sampling plan +wao.ui.import.terrestrialDivisionsLabel=of the terrestrial divisions (ObsDeb) +wao.ui.import.terrestrialLocationsLabel=of the terrestrial locations +wao.ui.import.title=Import %s +wao.ui.indicator.andMore=%s and more +wao.ui.indicator.bounds=Bounds +wao.ui.indicator.coefficient=Coefficient +wao.ui.indicator.editions=Editions +wao.ui.indicator.indicator=Indicator +wao.ui.indicator.legend=In yellow, the current position of the company on this indicator +wao.ui.indicator.levels=Levels +wao.ui.indicator.useRightDecimalSymbol=Use '.' for non-round values +wao.ui.indicators.coefficientsSum=Coefficients sum +wao.ui.indicators.title=Providers quality indicators +wao.ui.invalidLogin=Invalid identifier +wao.ui.layout.userDescription=You are %s of company %s (%s) +wao.ui.message.chooseProfile=Choose your profile \: +wao.ui.misc.METIER=METIER +wao.ui.misc.N/A=non available +wao.ui.misc.accepted=Accepted +wao.ui.misc.advancedSearch=Advanced search +wao.ui.misc.by=by +wao.ui.misc.changeOn=Edited on +wao.ui.misc.comment=Comment +wao.ui.misc.commentAddedOn=Comment added on +wao.ui.misc.comments=Comments +wao.ui.misc.companies=Companies +wao.ui.misc.createdOnF=Created on +wao.ui.misc.creating=Creating... +wao.ui.misc.dayOfWeek=Day +wao.ui.misc.export=Export +wao.ui.misc.export.longTitle=CSV export +wao.ui.misc.iCalendarExport=iCal export +wao.ui.misc.import=Import +wao.ui.misc.import-export=Import/export +wao.ui.misc.import-export.longTitle=CSV import/export (UTF-8) +wao.ui.misc.information=Information +wao.ui.misc.infosAbout=Infos about %s +wao.ui.misc.logFile.description=Show log file for %s +wao.ui.misc.no=no +wao.ui.misc.noComment=no comment +wao.ui.misc.notValidated=Not validated +wao.ui.misc.observationReport=Observation report +wao.ui.misc.observations=Observations +wao.ui.misc.observer=Observer +wao.ui.misc.observers=Associated observers +wao.ui.misc.onDate=on +wao.ui.misc.or=or +wao.ui.misc.other=Other +wao.ui.misc.otherInfos=Others information +wao.ui.misc.others=Others +wao.ui.misc.refused=Refused +wao.ui.misc.since=since +wao.ui.misc.total=Total +wao.ui.misc.undefined=Undefined +wao.ui.misc.validated=Validated +wao.ui.misc.week=Week +wao.ui.misc.year=Year +wao.ui.misc.yes=Yes +wao.ui.nContactsFound=%s contacts found +wao.ui.news.content=Text +wao.ui.news.title=Title +wao.ui.page.Administration.title=Administration +wao.ui.page.Boats.title=Boats +wao.ui.page.Cartography.title=Cartography +wao.ui.page.ContactForm.mammalsInfo.disclaimer=Warning, all the information you provide will be sent to external staff. Be rigourous when describing the accidental capture. +wao.ui.page.ContactForm.title=Contact edition +wao.ui.page.Contacts.title=Contacts +wao.ui.page.Index.title=Home +wao.ui.page.SamplingPlan.title=Sampling plan +wao.ui.page.Synthesis.title=Synthesis +wao.ui.page.UserProfileForm.title=Profile management +wao.ui.publishedByProgram=Pusblished by program +wao.ui.publishedByYourCompany=Published by company +wao.ui.sampleRow.creation=Creation of a sample row +wao.ui.sampleRow.edition=Edtion of line %s +wao.ui.sampleRowLog.title=%s line historic +wao.ui.samplingPlan.Actual=Actual +wao.ui.samplingPlan.actions=Actions +wao.ui.samplingPlan.actual=actual +wao.ui.samplingPlan.addSampleRow=Add a line in the sampling plan +wao.ui.samplingPlan.averageObservationsCount=Number of observations +wao.ui.samplingPlan.averageTideTime=Average tide time (d.) +wao.ui.samplingPlan.effort=Observation effort +wao.ui.samplingPlan.effort.obsVente=Observation effort +wao.ui.samplingPlan.estimated=estimated +wao.ui.samplingPlan.expected=expected +wao.ui.samplingPlan.export=Export the sampling plan from %s to %s +wao.ui.samplingPlan.fieldWork.see=View the field work sampling plan +wao.ui.samplingPlan.fieldWork.title=Field work sampling plan +wao.ui.samplingPlan.fishingZoneInfo=Fishing Zone others infos +wao.ui.samplingPlan.months=Months +wao.ui.samplingPlan.nbObservants=Nb. observers +wao.ui.samplingPlan.observationTimesInDays=Observation effort in days on board +wao.ui.samplingPlan.phoneCall.see=View the phone call sampling plan +wao.ui.samplingPlan.phoneCall.title=Phone call sampling plan +wao.ui.samplingPlan.program=program +wao.ui.samplingPlan.sampledProfessions=Sampled professions +wao.ui.samplingPlan.showActual=Show realisez observations efforfor validated contacts only +wao.ui.samplingPlan.showExpected=Show estimated observations effort for contacts validated by company or not +wao.ui.samplingPlan.title=Sampling plan +wao.ui.synthesis.allegroReactivity.description=This result is an average of the number of days between the data input date and the date of the observation end. +wao.ui.synthesis.allegroReactivity.title=Data input reactivity +wao.ui.synthesis.boarding.boardingCount=Total \: %s invalid boardings on %s boardings. +wao.ui.synthesis.boarding.description=In these results, only sample rows with average tide time below 48 hours are considered. +wao.ui.synthesis.boarding.mostUsedBoat=Most used boat with %s boardings \: %s (%s) +wao.ui.synthesis.boarding.title=Boats solicitations +wao.ui.synthesis.complianceBoarding.description=Respect of the defined number of observants for each tides. +wao.ui.synthesis.complianceBoarding.title=Respect of the number of observers +wao.ui.synthesis.contactsStates.description=Theses results consider all contacts states except those that are refused by the program. +wao.ui.synthesis.contactsStates.title=Contact states +wao.ui.synthesis.dataReliability.description=Percentage of the number of tides providing reliable data in relation to the total number of realized tides. +wao.ui.synthesis.dataReliability.title=Data reliability +wao.ui.synthesis.dataSampling.title=Tides data (realized / expected) +wao.ui.synthesis.distinctBoatsCounts.axisName=Number of boats +wao.ui.synthesis.distinctBoatsCounts.categoryName=Month of the year +wao.ui.synthesis.distinctBoatsCounts.description=For each month, the number of distinct boats observed during this month +wao.ui.synthesis.distinctBoatsCounts.title=Numbers of boats observed depending on the year +wao.ui.synthesis.globalSynthesis.globalResult=Result of the global synthesis +wao.ui.synthesis.globalSynthesis.title=Global synthesis +wao.ui.synthesis.globalSynthesis.title.estimated=Global synthesis (according to estimations) +wao.ui.synthesis.log.description=This page show every modifications done since the beginning of the bounds of each levels and the coefficients of each indicators. +wao.ui.synthesis.log.empty=No modification until now +wao.ui.synthesis.log.entry.author=Modification's author +wao.ui.synthesis.log.entry.comment=Associated comment +wao.ui.synthesis.log.entry.date=Modification date +wao.ui.synthesis.log.entry.summary=Modifications done +wao.ui.synthesis.log.title=Global synthesis parameters historic +wao.ui.synthesis.observationHours.axisName=Number of observations +wao.ui.synthesis.observationHours.categoryName=Hours of the day +wao.ui.synthesis.observationHours.description=Number of observations according to the time of the day (based on the observation begin date) +wao.ui.synthesis.observationHours.title=Observation hours +wao.ui.unavailableOperation=Unavailable operation +wao.ui.userList=Users list +wao.ui.userMustAcceptCgu=You must accept the terms of use +wao.ui.validLogin=Valid identifier Property changes on: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:mergeinfo + /branches/wao-1.5.x/wao-ui/src/main/resources/i18n/wao-ui_en_GB.properties:679-733 Added: svn:eol-style + native Copied: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties (from rev 1675, tags/wao-3.4.1/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties) =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties (rev 0) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,347 @@ +StrategyValues.CONTACTS_STATES=États des contacts selon le quartier maritime +StrategyValues.CONTACTS_STATES_MOTIFS=Motifs de refus +StrategyValues.CONTACTS_STATES_SEABOARDS=États des contacts selon la façade maritime +SynthesisId.DISTINCT_BOATS_COUNTS= +SynthesisId.GRAPH_BOARDING= +SynthesisId.GRAPH_SAMPLING= +SynthesisId.IND_ALLEGRO_REACTIVITY= +SynthesisId.IND_COMPLIANCE_BOARDING= +SynthesisId.IND_CONTACT_STATE= +SynthesisId.IND_DATA_RELIABILITY= +SynthesisId.OBSERVATION_HOUR= +cgu= +wao.ui.acceptCgu=J'ai lu et j'accepte les conditions d'utilisation +wao.ui.action.acceptContact=Valider le contact +wao.ui.action.add=Ajouter +wao.ui.action.addNewContactFromBoat=Créer un nouveau contact pour ce navire et la ligne sélectionnée dans les filtres +wao.ui.action.back=Revenier à l'écran précédent +wao.ui.action.cancel=Annuler +wao.ui.action.changeLocale=Changer de langue +wao.ui.action.contactAdmin=Contacter un responsable ObsMer +wao.ui.action.create=Créer +wao.ui.action.createCompany=Créer une société +wao.ui.action.createUser=Créer un utilisateur +wao.ui.action.delete=Supprimer +wao.ui.action.deleteCompany=Supprimer la société +wao.ui.action.deleteCompany.confirm=Êtes-vous sûr de vouloir supprimer la société ? +wao.ui.action.deleteContact=Supprimer le contact +wao.ui.action.deleteContact.confirm=Êtes-vous sûr de vouloir supprimer définitivement ce contact ? +wao.ui.action.deleteNews=Supprimer la nouvelle +wao.ui.action.deleteNews.confirm=Êtes-vous sûr de vouloir supprimer définitivement cette nouvelle ? +wao.ui.action.deleteSampleRow=Supprimer la ligne du plan +wao.ui.action.deleteSampleRow.confirm=Êtes-vous sûr de vouloir supprimer la ligne %s du plan ? +wao.ui.action.deleteUser=Supprimer l'utilisateur +wao.ui.action.deleteUser.confirm=Êtes-vous sûr de vouloir supprimer l'utilisateur ? +wao.ui.action.edit=Modifier +wao.ui.action.enlargeView=Agrandir la vue +wao.ui.action.exportBoats=Exporter les $s navires avec leurs informations privées +wao.ui.action.filter=Filtrer +wao.ui.action.hideFilters=Masquer les filtres +wao.ui.action.login=Connexion +wao.ui.action.logout=Déconnexion +wao.ui.action.reduceView=Réduire la vue +wao.ui.action.refresh=Rafraîchir +wao.ui.action.refuseContact=Refuser le contact +wao.ui.action.remove=Retirer +wao.ui.action.resetFields=Remettre le formulaire à zéro +wao.ui.action.revert=Annuler +wao.ui.action.runExport=Lancer l'export +wao.ui.action.runImport=Lancer l'import +wao.ui.action.runSearch=Lancer la recherche +wao.ui.action.save=Enregistrer +wao.ui.action.showDetails=Voir les détails +wao.ui.action.showFilters=Afficher les filtres +wao.ui.action.unvalidateContact=Invalider le contact +wao.ui.action.viewBoatsForRow=Voir les navires présentis pour cette ligne +wao.ui.action.viewIndicatorsHistory=Voir l'historique des modifications des indicateurs +wao.ui.boatList=Liste de %s navires +wao.ui.boatinfo.title=Informations sur %s +wao.ui.boats.associatedLine=Ligne(s) du plan associée(s) à ce navire +wao.ui.boats.nbObservations=%s observation(s) dont %s avec votre société +wao.ui.boats.portOfRegistry.description=Il s'agit du port d'exploitation principal du navire +wao.ui.boats.portOfRegistry.header=Port +wao.ui.boats.selecting=Vous êtes en cours de sélection d'un navire pour la ligne du plan %s +wao.ui.boats.substitutes=Substituts du navire +wao.ui.cartography.help=Cliquez sur les graphiques pour avoir le détail. +wao.ui.cartography.title=Répartition des contacts par quartier des navires +wao.ui.cartography.title.company=Répartition des contacts par quartier des navires pour la société %s +wao.ui.chart.boardingsSince=Nombre de sollicitations depuis le %s +wao.ui.chart.numberBoats=Nb navires +wao.ui.chart.numberObservations=Nb observations +wao.ui.chart.numberOfBoatsWithBoardings=Nombre de navires avec x embarquements +wao.ui.chooseUserProfile=Choisissez votre rôle +wao.ui.contact.lastContact=Dernière observation concernant ce navire pour votre société (tous programmes confondus) +wao.ui.contacts.createFromBoat=Créer un nouveau contact pour ce navire et cette ligne du plan +wao.ui.contacts.createFromBoat.fail=Création d'un nouveau contact impossible +wao.ui.contacts.createFromBoat.warn=Attention \: cette ligne du plan est arrivée à échéance, êtes-vous sûr de vouloir créer un nouveau contact ? +wao.ui.disclaimer=Le site de « SUIVI DU REALISE DU PLAN D'ECHANTILLONNAGE DES OBSERVATIONS A LA MER » a fait l'objet d'une déclaration à la CNIL sous le numéro suivant \: 1414476 +wao.ui.disclaimer.boats=Les données saisies dans cette page sont la propriété exclusive de la société. En dehors de la société, seul l'administrateur peut les consulter pour des questions de maintenance sur le site. L'administrateur est une personne de l'Ifremer. +wao.ui.email=Adresse e-mail +wao.ui.entity.Boat=Navire +wao.ui.entity.Boats=Navires +wao.ui.entity.Company=Société +wao.ui.entity.Contact=Contact +wao.ui.entity.FishingZone=Zones de pêche +wao.ui.entity.SampleRow=Ligne du plan d'échantillonnage +wao.ui.entity.TerrestrialLocation=Lieu +wao.ui.entity.fishingGearDCF=Engin code DCF +wao.ui.entity.targetSpeciesDCF=Ensembles d'espèces-cible code DCF +wao.ui.field.Boat.boatGroup=Strate +wao.ui.field.Boat.boatLength=Longueur +wao.ui.field.Boat.buildYear=Année de construction +wao.ui.field.Boat.district=Quartier maritime +wao.ui.field.Boat.districtCode=Code quartier +wao.ui.field.Boat.fleet=Flotille +wao.ui.field.Boat.immatriculation=Immatriculation +wao.ui.field.Boat.name=Nom +wao.ui.field.Boat.portOfRegistry=Port d'attache +wao.ui.field.Boat.shipOwner=Armateur +wao.ui.field.BoatInfos.dup=Capacité d'accueil du navire en personnels spécialisés +wao.ui.field.Company.active=Active +wao.ui.field.Company.name=Nom +wao.ui.field.Contact.beginDate=Début d'observation +wao.ui.field.Contact.comment=Commentaire observateur +wao.ui.field.Contact.commentAdmin=Commentaire programme +wao.ui.field.Contact.commentCoordinator=Commentaire coordinateur +wao.ui.field.Contact.completeSampling=Échantillonnage complet +wao.ui.field.Contact.contactState=État du contact +wao.ui.field.Contact.contactStateMotif=Motif du refus +wao.ui.field.Contact.contactStateMotifs=Motifs de refus +wao.ui.field.Contact.creationDate=Date de création du contact +wao.ui.field.Contact.dataInputDate=Saisie des données +wao.ui.field.Contact.dataReliability=Qualité des données +wao.ui.field.Contact.endDate=Fin d'observation +wao.ui.field.Contact.landingDate=Date et heure de débarquement +wao.ui.field.Contact.mainObserver=Observateur référent +wao.ui.field.Contact.mammalsCapture=Capture accidentelle +wao.ui.field.Contact.mammalsInfo=Noms scientifiques et nombres d'individus des espèces capturées +wao.ui.field.Contact.mammalsObservation=Observation exceptionnelle +wao.ui.field.Contact.nbObservants=Nombre d'observateurs +wao.ui.field.Contact.obsDebCode=Métier +wao.ui.field.Contact.observationType=Type d'observation +wao.ui.field.Contact.observedDataControl=Contrôle des données observées +wao.ui.field.Contact.restitution=Transmission de la restitution +wao.ui.field.Contact.samplingStrategy=Stratégie d'échantillonnage suivie +wao.ui.field.Contact.secondaryObservers=Observateurs +wao.ui.field.Contact.terrestrialLocation=Lieu d'observation +wao.ui.field.Contact.validationCompany=Validation société +wao.ui.field.Contact.validationProgram=Validation programme +wao.ui.field.FishingZone.facadeName=Façade +wao.ui.field.FishingZone.sectorName=Zone +wao.ui.field.SampleRow.appliedCoverageRate=Taux de couverture appliqué +wao.ui.field.SampleRow.boat=Navire +wao.ui.field.SampleRow.code=Code ligne +wao.ui.field.SampleRow.comment=Commentaire +wao.ui.field.SampleRow.company=Société +wao.ui.field.SampleRow.dCF5Code=Codes +wao.ui.field.SampleRow.day=Jour +wao.ui.field.SampleRow.dcf5Code=Code DCF Niv. 5 +wao.ui.field.SampleRow.expectedDate=Date +wao.ui.field.SampleRow.fishingZones=Zone(s) de pêche +wao.ui.field.SampleRow.libelle=Libellé +wao.ui.field.SampleRow.meshSize=Maillage +wao.ui.field.SampleRow.observationType=Type d'observation +wao.ui.field.SampleRow.observationUnit=Unité d'observation +wao.ui.field.SampleRow.observers=Observateurs +wao.ui.field.SampleRow.other=Autre +wao.ui.field.SampleRow.periodBegin=Début +wao.ui.field.SampleRow.periodEnd=Fin +wao.ui.field.SampleRow.profession=Métier +wao.ui.field.SampleRow.professionCode=Code métier +wao.ui.field.SampleRow.programName=Programme +wao.ui.field.SampleRow.regionIfremer=Région +wao.ui.field.SampleRow.samplingStrategy=Stratégie d'échantillonnage +wao.ui.field.SampleRow.size=Taille du navire +wao.ui.field.SampleRow.species=Espèces cibles +wao.ui.field.SampleRow.terrestrialLocation=Quartier maritime +wao.ui.field.SampleRow.terrestrialLocationInfos=Autre(s) info(s) +wao.ui.field.SampleRow.terrestrialLocations=Quartiers maritimes +wao.ui.field.TerrestrialDivision.regionIfremer=Région Ifremer +wao.ui.field.TerrestrialDivision.skillZone=Zone de compétence +wao.ui.field.TerrestrialDivision.subPopulation=Sous-population +wao.ui.field.User.firstName=Prénom +wao.ui.field.User.lastName=Nom +wao.ui.field.User.login=Identifiant +wao.ui.field.UserProfile.userRole=Rôle +wao.ui.field.WaoUser.canReadBoats=Restreindre la vue aux navires +wao.ui.field.WaoUser.login=Identifiant +wao.ui.field.WaoUser.mammalsNotifications=Recevoir les notifications de captures accidentelles +wao.ui.field.WaoUser.password=Mot de passe +wao.ui.filters.filters=Filtres de recherche +wao.ui.filters.refresh=Rafraîchir les champs du filtre +wao.ui.forgotPassword=Mot de passe oublié ? +wao.ui.form.SampleRow.boatsDescription=Ce champs correspond aux immatriculations des navires qui sont éligibles pour cette ligne. Vous pouvez utiliser n'importe quel séparateur pour séparer les immatriculations (virgule, point, espace ou saut de ligne) +wao.ui.form.SampleRow.error.missingLogComment=Vous devez préciser la raison de vos modifications +wao.ui.form.SampleRow.missingBeginDate=Date de début manquante pour générer le code de la ligne \! +wao.ui.form.SampleRow.others=Autres données de la ligne d'échantillonnage +wao.ui.form.SampleRow.program=Programme de rattachement et effort d'observation par mois +wao.ui.form.addComment=Ajouter un commentaire +wao.ui.form.addRole=Ajouter ce rôle +wao.ui.form.boardingFrom=Sollicitations du navire depuis le +wao.ui.form.contactsFile=Fichier des contacts +wao.ui.form.definePasswordManually=définir manuellement +wao.ui.form.editComment=Commentaire sur la modification +wao.ui.form.editionAuthor=Auteur de la modification +wao.ui.form.estimatedTides=Voir l'effort d'observations estimé +wao.ui.form.estimatedTides.description=L'effort d'observations estimé équivaut au nombre de contacts validés ou non par la société. Les contacts refusés par le programme ne sont pas pris en compte. +wao.ui.form.filterOnObservationBeginDate=Filtrer selon la date de début d'observation +wao.ui.form.generatePassword=Générer le mot de passe +wao.ui.form.mapType=Carte +wao.ui.form.otherBoatInfos=Autres informations sur le navire +wao.ui.form.period=Période +wao.ui.form.period.from=du +wao.ui.form.period.to=au +wao.ui.form.periodFrom=Période du +wao.ui.form.periodFromTo=Période du %s au %s +wao.ui.form.program=Programme +wao.ui.form.programEvaluation=Évaluation programme +wao.ui.form.readOnly=lecture seule +wao.ui.form.removeRole=retirer ce role +wao.ui.form.repeatPassword=Répéter le mot de passe +wao.ui.form.roles=Rôles +wao.ui.form.sortByTideBegin=Trier par date de début d'observation (du plus récent au plus ancien) +wao.ui.import.boatDistrictLabel=des coordonnées des quartiers des navires +wao.ui.import.boatGroupsLabel=des strates des navires +wao.ui.import.boatsLabel=des navires +wao.ui.import.contactStateMotivesLabel=des motifs de refus +wao.ui.import.description=Fichier %s %s \: +wao.ui.import.fishingZoneLabel=des zones de pêches +wao.ui.import.fullDescription=Import %s (format %s avec encodage UTF-8) +wao.ui.import.longTitle=Import/Export CSV (UTF-8) +wao.ui.import.obsDebCodesLabel=des codes métiers ObsDeb +wao.ui.import.samplingPlanLabel=du plan d'échantillonnage +wao.ui.import.terrestrialDivisionsLabel=du référentiel de stratification spatiale (ObsDeb) +wao.ui.import.terrestrialLocationsLabel=des lieux terrestres +wao.ui.import.title=Import %s +wao.ui.indicator.andMore=%s et plus +wao.ui.indicator.bounds=Bornes +wao.ui.indicator.coefficient=Pondération +wao.ui.indicator.editions=Modifications +wao.ui.indicator.indicator=Indicateur +wao.ui.indicator.legend=En jaune, la position actuelle de la société selon cet indicateur. +wao.ui.indicator.levels=Niveaux +wao.ui.indicator.useRightDecimalSymbol=Attention à bien utiliser ',' et non '.' pour les décimales +wao.ui.indicators.coefficientsSum=Total coefficient +wao.ui.indicators.title=Indicateurs qualités prestataires +wao.ui.invalidLogin=Identifiant invalide +wao.ui.layout.userDescription=Vous êtes %s de la société %s (%s) +wao.ui.message.chooseProfile=Choisissez dans la liste votre profil de connexion \: +wao.ui.misc.METIER=MÉTIER +wao.ui.misc.N/A=non renseignée +wao.ui.misc.accepted=Accepté +wao.ui.misc.advancedSearch=Recherche avancée +wao.ui.misc.by=par +wao.ui.misc.changeOn=Modification du +wao.ui.misc.comment=Commentaire +wao.ui.misc.commentAddedOn=Commentaire ajouté le +wao.ui.misc.comments=Commentaires +wao.ui.misc.companies=Sociétés +wao.ui.misc.createdOnF=Créée le +wao.ui.misc.creating=En cours de création +wao.ui.misc.dayOfWeek=Jour +wao.ui.misc.export=Export +wao.ui.misc.export.longTitle=Export CSV +wao.ui.misc.iCalendarExport=Export iCal +wao.ui.misc.import=Import +wao.ui.misc.import-export=Import/export +wao.ui.misc.import-export.longTitle=Import/export CSV (UTF-8) +wao.ui.misc.information=Informations +wao.ui.misc.infosAbout=Informations sur %s +wao.ui.misc.logFile.description=Afficher le fichier de log de %s +wao.ui.misc.no=Non +wao.ui.misc.noComment=aucun commentaire +wao.ui.misc.notValidated=Non validé +wao.ui.misc.observationReport=Compte-rendu d'observation +wao.ui.misc.observations=Observations +wao.ui.misc.observer=Observateur +wao.ui.misc.observers=Observateurs associés +wao.ui.misc.onDate=le +wao.ui.misc.or=ou +wao.ui.misc.other=Autre +wao.ui.misc.otherInfos=Autre information +wao.ui.misc.others=Autres +wao.ui.misc.refused=Réfusé +wao.ui.misc.since=depuis le +wao.ui.misc.total=Total +wao.ui.misc.undefined=Non-défini +wao.ui.misc.validated=Validé +wao.ui.misc.week=Semaine +wao.ui.misc.year=Année +wao.ui.misc.yes=Oui +wao.ui.nContactsFound=%s contacts trouvés +wao.ui.news.content=Texte +wao.ui.news.title=Titre +wao.ui.page.Administration.title=Administration +wao.ui.page.Boats.title=Navires +wao.ui.page.Cartography.title=Cartographie +wao.ui.page.ContactForm.mammalsInfo.disclaimer=Attention, toutes les informations saisies seront transmises à des personnels extérieurs, soyez riguoureux dans la description de la capture accidentelle +wao.ui.page.ContactForm.title=Modification d'un contact +wao.ui.page.Contacts.title=Contacts +wao.ui.page.Index.title=Accueil +wao.ui.page.SamplingPlan.title=Plan d'échantillonnage +wao.ui.page.Synthesis.title=Synthèse +wao.ui.page.UserProfileForm.title=Gestion du profil +wao.ui.publishedByProgram=Publiée par le programme +wao.ui.publishedByYourCompany=Publiée par la société +wao.ui.sampleRow.creation=Création d'une ligne du plan d'échantillonnage +wao.ui.sampleRow.edition=Modification de la ligne %s +wao.ui.sampleRowLog.title=Historique de la ligne %s +wao.ui.samplingPlan.Actual=Réalisé +wao.ui.samplingPlan.actions=Actions +wao.ui.samplingPlan.actual=réalisé +wao.ui.samplingPlan.addSampleRow=Ajouter une ligne au plan d'échantillonnage +wao.ui.samplingPlan.averageObservationsCount=Nombre d'observations +wao.ui.samplingPlan.averageTideTime=Durée moyenne d'une marée (J.) +wao.ui.samplingPlan.effort=Effort d'observation en nombre de marées +wao.ui.samplingPlan.effort.obsVente=Effort d'observation en nombre de sorties +wao.ui.samplingPlan.estimated=estimé +wao.ui.samplingPlan.expected=planifié +wao.ui.samplingPlan.export=Exporter le plan d'échantillonnage du %s au %s +wao.ui.samplingPlan.fieldWork.see=Voir le plan d'échantillonnage de terrain +wao.ui.samplingPlan.fieldWork.title=Plan d'échantillonnage de terrain +wao.ui.samplingPlan.fishingZoneInfo=Zone autre(s) info(s) +wao.ui.samplingPlan.months=Mois +wao.ui.samplingPlan.nbObservants=Nb. d'observateurs +wao.ui.samplingPlan.observationTimesInDays=Effort d'observation en jours de mers +wao.ui.samplingPlan.phoneCall.see=Voir le plan d'échantillonnage téléphonique +wao.ui.samplingPlan.phoneCall.title=Plan d'échantillonnage téléphonique +wao.ui.samplingPlan.program=Programme ou règlement rattachement +wao.ui.samplingPlan.sampledProfessions=Métiers échantillonnés +wao.ui.samplingPlan.showActual=Afficher l'effort d'observations réalisé pour les contacts validés seulement +wao.ui.samplingPlan.showExpected=Afficher l'effort d'observations estimé pour les contacts validés ou non par la société +wao.ui.samplingPlan.title=Plan d'échantillonnage +wao.ui.synthesis.allegroReactivity.description=Ce résultat est une moyenne du nombre de jours entre la date de saisie des données et la date de fin d'observation. +wao.ui.synthesis.allegroReactivity.title=Réactivité quant à la saisie des données +wao.ui.synthesis.boarding.boardingCount=Au total, %s observations invalides sur %s observations. +wao.ui.synthesis.boarding.description=Ces résultats ne concernent que les lignes du plan d'échantillonnage ayant une durée moyenne de marées inférieure ou égale à 48h. +wao.ui.synthesis.boarding.mostUsedBoat=Navire le plus sollicité avec %s observations (tous programmes confondus) \: %s (%s) +wao.ui.synthesis.boarding.title=Sollicitations des navires +wao.ui.synthesis.complianceBoarding.description=Respect du nombre prévu d'observateurs pour chaque marée réalisée. +wao.ui.synthesis.complianceBoarding.title=Respect du nombre d'observateurs embarqués +wao.ui.synthesis.contactsStates.description=Ces résultats concernent l'ensemble des états des contacts excepté ceux qui ont été refusés par le programme. +wao.ui.synthesis.contactsStates.title=États des contacts +wao.ui.synthesis.dataReliability.description=Pourcentage du nombre de marées exploitables par rapport nombre de marée réalisées. +wao.ui.synthesis.dataReliability.title=Qualité de la donnée +wao.ui.synthesis.dataSampling.title=Données des marées (réalisé / planifié) +wao.ui.synthesis.distinctBoatsCounts.axisName=Nombre de navires distincts +wao.ui.synthesis.distinctBoatsCounts.categoryName=Mois de l'année +wao.ui.synthesis.distinctBoatsCounts.description=Nombre de navires distincts observés selon le mois de l'année +wao.ui.synthesis.distinctBoatsCounts.title=Nombre de navires observés +wao.ui.synthesis.globalSynthesis.globalResult=Bilan de la synthèse global +wao.ui.synthesis.globalSynthesis.title=Synthèse globale +wao.ui.synthesis.globalSynthesis.title.estimated=Synthèse globale (selon estimations) +wao.ui.synthesis.log.description=Cette page présente toutes les modifications effectuées depuis l'origine qui portent sur les bornes de chaque niveaux ainsi que les coefficients de chaque indicateurs. +wao.ui.synthesis.log.empty=Aucune modification n'a été apportée à ce jour +wao.ui.synthesis.log.entry.author=Auteur de la modification +wao.ui.synthesis.log.entry.comment=Commentaire associé +wao.ui.synthesis.log.entry.date=Date de la modification +wao.ui.synthesis.log.entry.summary=Modifications effectuées +wao.ui.synthesis.log.title=Historique des modifications des paramètres de la synthèse globale +wao.ui.synthesis.observationHours.axisName=Nombre d'observations +wao.ui.synthesis.observationHours.categoryName=Heures de la journée +wao.ui.synthesis.observationHours.description=Nombre d'observations effectuée selon l'heure d'arrivée +wao.ui.synthesis.observationHours.title=Distribution des périodes d'observation +wao.ui.unavailableOperation=Opération non-disponible +wao.ui.userList=Liste des utilisateurs +wao.ui.userMustAcceptCgu=Vous devez accepter les conditions d'utilisation pour utiliser Wao +wao.ui.validLogin=Identifiant valide Property changes on: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:mergeinfo + /branches/wao-1.5.x/wao-ui/src/main/resources/i18n/wao-ui_fr_FR.properties:679-733 Added: svn:eol-style + native Added: trunk/wao-web/src/main/resources/log4j.properties =================================================================== --- trunk/wao-web/src/main/resources/log4j.properties (rev 0) +++ trunk/wao-web/src/main/resources/log4j.properties 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,22 @@ +log4j.rootCategory=WARN, console + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %M %m%n + +# global level +log4j.logger.fr.ifremer.wao=TRACE + +### persistence level +# log4j.logger.org.nuiton.topia=TRACE + +### services level +# log4j.logger.fr.ifremer.wao.services=TRACE + +### web level +# log4j.logger.fr.ifremer.wao.web=TRACE + +# annoying errors +#log4j.logger.com.opensymphony.xwork2.interceptor.ParametersInterceptor=FATAL +#log4j.logger.com.opensymphony.xwork2.conversion.impl.InstantiatingNullHandler=FATAL +#log4j.logger.com.opensymphony.xwork2.ognl.OgnlValueStack=ERROR Added: trunk/wao-web/src/main/resources/shiro.ini =================================================================== --- trunk/wao-web/src/main/resources/shiro.ini (rev 0) +++ trunk/wao-web/src/main/resources/shiro.ini 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,37 @@ +[main] +# URL vers laquelle il faut rediriger si l'utilisateur n'est pas authentifié +authc.loginUrl = /authentication/login.action + +# dans le formulaire d'authentifaction, le champs contenant le username s'appelle "email" +authc.usernameParam = email +# authc.passwordParam = password + +# on utilise un cache dans notre implémentation du Realm, il faut le configurer +cacheManager = org.apache.shiro.cache.MemoryConstrainedCacheManager +securityManager.cacheManager = $cacheManager + +# on indique notre implémentation du realm +waoRealm = fr.ifremer.wao.web.WaoRealm + +# on l'indique comme seul realm à utiliser +securityManager.realms = $waoRealm + +[urls] + +# on doit pouvoir accéder à ces pages sans être authentifié +/authentication/login* = anon +/authentication/forgotten-password-* = anon +/authentication/registration* = anon + +# on donne accès aux ressource statiques +/css/** = anon +/data/** = anon +/font/** = anon +/img/** = anon +/js/** = anon +/struts/js/** = anon +/struts/themes/** = anon +/struts/bootstrap/** = anon + +# pour tout le reste, il faut être authentifié +/** = authc Added: trunk/wao-web/src/main/resources/struts.properties =================================================================== --- trunk/wao-web/src/main/resources/struts.properties (rev 0) +++ trunk/wao-web/src/main/resources/struts.properties 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,47 @@ +### +# #%L +# Extranet ENC-AHI :: Web +# $Id: struts.properties 841 2013-12-09 14:03:56Z bleny $ +# $HeadURL: http://svn.forge.codelutin.com/svn/extranet-enc-ahi/trunk/extranet-web/src/… $ +# %% +# Copyright (C) 2013 Ministère des Affaires sociales et de la Santé +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser 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 Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### + +struts.ui.theme=bootstrap +struts.ognl.allowStaticMethodAccess=true + +# Help debugging +struts.devMode=${devMode} +struts.ognl.logMissingProperties=${devMode} +struts.el.throwExceptionOnFailure=${devMode} +struts.i18n.reload=${devMode} +struts.custom.i18n.resources=resources +struts.configuration.xml.reload=${devMode} +struts.convention.classes.reload=${devMode} + +# Performance tuning +# see http://struts.apache.org/2.2.3/docs/performance-tuning.html +struts.freemarker.templatesCache=true + +struts.convention.package.locators.basePackage=fr.ifremer.wao.web.action + +# FIXME bleny 06/12/2013 définir à true ouvre une faille de sécurité, voir http://struts.apache.org/release/2.3.x/docs/s2-019.html si on laisse la valeur par défaut, l'appli mouline dès qu'on appel une action autre que execute, on attend que convention-plugin soit adapté pour pouvoir poser une anot sur les méthodes inputs +struts.enable.DynamicMethodInvocation=true + +# FIXME bleny 09/12/2013 définir à true ouvre une faille de sécurité, voir http://struts.apache.org/release/2.3.x/docs/s2-018.html ne pas surcharger cette valeur empêche de définir l'action!methode à appeller au submit et on passe toujours le execute, ça casse le formulaire de déclaration (quand on veut passer à l'étape suivante (!next) on se retrouve dans le résumé (!execute)) +struts.mapper.action.prefix.enabled=true Added: trunk/wao-web/src/main/resources/struts.xml =================================================================== --- trunk/wao-web/src/main/resources/struts.xml (rev 0) +++ trunk/wao-web/src/main/resources/struts.xml 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,58 @@ + +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" + "http://struts.apache.org/dtds/struts-2.0.dtd"> +<struts> + + <constant name="struts.convention.default.parent.package" value="waoPackage" /> + + <bean class="org.nuiton.web.struts2.I18nTextProvider" name="i18nTextProvider" type="com.opensymphony.xwork2.TextProvider" /> + + <bean type="com.opensymphony.xwork2.conversion.impl.NumberConverter" class="org.nuiton.web.struts2.converters.HundredthLocalNumberConverter" scope="singleton"/> + + <constant name="struts.objectFactory" value="fr.ifremer.wao.web.WaoStrutsObjectFactory" /> + + <constant name="struts.xworkTextProvider" value="i18nTextProvider" /> + + <constant name="struts.multipart.maxSize" value="10485760" /> + + <package name="waoPackage" namespace="/" extends="json-default"> + + <interceptors> + + <interceptor name="waoInterceptor" class="fr.ifremer.wao.web.WaoInterceptor"/> + + <interceptor-stack name="waoStack"> + <interceptor-ref name="waoInterceptor" /> + <interceptor-ref name="paramsPrepareParamsStack" /> + </interceptor-stack> + </interceptors> + + <default-interceptor-ref name="waoStack"/> + + </package> + + +</struts> Added: trunk/wao-web/src/main/resources/xwork-conversion.properties =================================================================== --- trunk/wao-web/src/main/resources/xwork-conversion.properties (rev 0) +++ trunk/wao-web/src/main/resources/xwork-conversion.properties 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,26 @@ +### +# #%L +# Extranet ENC-AHI :: Web +# $Id: xwork-conversion.properties 973 2014-01-15 14:05:09Z bleny $ +# $HeadURL: http://svn.forge.codelutin.com/svn/extranet-enc-ahi/trunk/extranet-web/src/… $ +# %% +# Copyright (C) 2013 Ministère des Affaires sociales et de la Santé +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser 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 Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### + +java.lang.Double=org.nuiton.web.struts2.converters.HundredthLocalNumberConverter +java.lang.Integer=org.nuiton.web.struts2.converters.HundredthLocalNumberConverter Added: trunk/wao-web/src/main/webapp/WEB-INF/content/authentication/login.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/authentication/login.jsp (rev 0) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/authentication/login.jsp 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,28 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<!DOCTYPE html> +<%@taglib uri="/struts-tags" prefix="s" %> +<%@taglib prefix="sj" uri="/struts-jquery-tags" %> +<html> + <head> + <title>Identification</title> + </head> + <body> + + <p>Veuillez entrer vos identifiants pour accéder à votre espace</p> + + <s:form action="login" namespace="/authentication" method="post" cssClass="form-horizontal"> + + <s:textfield name="email" + label="Votre adresse de courrier électronique :"/> + + <s:password name="password" + label="Votre mot de passe :"/> + + <sj:a openDialog="forgottenPasswordForm" cssClass="controls">J'ai oublié mon mot de passe</sj:a> + + <s:submit value="S'identifier" type='button' cssClass="btn btn-primary"/> + + </s:form> + + </body> +</html> Added: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp (rev 0) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout-login.jsp 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,86 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sb" uri="/struts-bootstrap-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<%@ taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %> +<!DOCTYPE html> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <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='/js/select2/select2.min.js' />"></script> + <script type="text/javascript" src="<s:url value='/js/select2/select2_locale_fr.js' />"></script> + <script type="text/javascript" src="<s:url value='/js/wao.js' />"></script> + <link rel="stylesheet" type="text/css" href="<s:url value='/css/select2/select2.css' />" /> + <link rel="stylesheet" type="text/css" href="<s:url value='/css/wao.css' />" media="all" /> + <link rel="stylesheet" type="text/css" href="<s:url value='/css/wao-screen.css' />" media="screen"> + <decorator:head /> + </head> + + <body> + + <content> + <s:actionerror theme="bootstrap" /> + <s:actionmessage theme="bootstrap" /> + <s:fielderror theme="bootstrap" /> + <decorator:body /> + </content> + + <footer class="hidden-print<s:if test="%{instanceDisclaimer != null}"> disclaimer-displayed</s:if>" > + <ul> + <li> + <a href="http://maven-site.forge.codelutin.com/wao/" target="_blank"> + WAO + </a> + </li> + <li> + <a href="http://forge.codelutin.com/projects/wao/news" target="_blank"> + <%@include file="version.jsp" %> + </a> + </li> + <t:if test="connectedUser.obsMer"> + <li> + <a href="mailto:harmonie@ifremer.fr" title="Contacter un responsable Obsmer"> + Obsmer + </a> + </li> + </t:if> + <li> + <a href="http://sih.ifremer.fr/" title="Page d'accueil du SIH" target="_blank"> + Ifremer SIH + </a> + </li> + <li> + <a href="http://www.gnu.org/licenses/agpl.html" title="License AGPL v3" target="_blank"> + AGPLv3 + </a> + </li> + <li> + Copyright 2009-${currentYear} + <a href="http://www.ifremer.fr" title="Ifremer" target="_blank"> + Ifremer + </a>, + <a href="http://www.codelutin.com" title="Code Lutin" target="_blank"> + Code Lutin + </a> + </li> + </ul> + <s:if test="obsMer"> + <p class="cnil"> + ${message:wao.ui.disclaimer} + </p> + </s:if> + </footer> + + <s:if test="%{instanceDisclaimer != null}"> + <div id="instance-disclaimer"> + <div> + <s:property value="instanceDisclaimer" /> + </div> + </div> + </s:if> + + </body> +</html> Added: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp (rev 0) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,92 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sb" uri="/struts-bootstrap-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<%@ taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %> +<!DOCTYPE html> +<html> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <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='/js/select2/select2.min.js' />"></script> + <script type="text/javascript" src="<s:url value='/js/select2/select2_locale_fr.js' />"></script> + <script type="text/javascript" src="<s:url value='/js/wao.js' />"></script> + <link rel="stylesheet" type="text/css" href="<s:url value='/css/select2/select2.css' />" /> + <link rel="stylesheet" type="text/css" href="<s:url value='/css/wao.css' />" media="all" /> + <link rel="stylesheet" type="text/css" href="<s:url value='/css/wao-screen.css' />" media="screen"> + <decorator:head /> + </head> + + <body> + + <header> + Plan d'échantillonnage + Contacts + Synthèses + </header> + + <content> + <s:actionerror theme="bootstrap" /> + <s:actionmessage theme="bootstrap" /> + <s:fielderror theme="bootstrap" /> + <decorator:body /> + </content> + + <footer class="hidden-print<s:if test="%{instanceDisclaimer != null}"> disclaimer-displayed</s:if>" > + <ul> + <li> + <a href="http://maven-site.forge.codelutin.com/wao/" target="_blank"> + WAO + </a> + </li> + <li> + <a href="http://forge.codelutin.com/projects/wao/news" target="_blank"> + <%@include file="version.jsp" %> + </a> + </li> + <t:if test="connectedUser.obsMer"> + <li> + <a href="mailto:harmonie@ifremer.fr" title="Contacter un responsable Obsmer"> + Obsmer + </a> + </li> + </t:if> + <li> + <a href="http://sih.ifremer.fr/" title="Page d'accueil du SIH" target="_blank"> + Ifremer SIH + </a> + </li> + <li> + <a href="http://www.gnu.org/licenses/agpl.html" title="License AGPL v3" target="_blank"> + AGPLv3 + </a> + </li> + <li> + Copyright 2009-${currentYear} + <a href="http://www.ifremer.fr" title="Ifremer" target="_blank"> + Ifremer + </a>, + <a href="http://www.codelutin.com" title="Code Lutin" target="_blank"> + Code Lutin + </a> + </li> + </ul> + <t:if test="connectedUser.obsMer"> + <p class="cnil"> + ${message:wao.ui.disclaimer} + </p> + </t:if> + </footer> + + <s:if test="%{instanceDisclaimer != null}"> + <div id="instance-disclaimer"> + <div> + <s:property value="instanceDisclaimer" /> + </div> + </div> + </s:if> + + </body> +</html> Added: trunk/wao-web/src/main/webapp/WEB-INF/decorators/version.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/version.jsp (rev 0) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/version.jsp 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,2 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +${project.version} \ No newline at end of file Added: trunk/wao-web/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators.xml (rev 0) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators.xml 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,14 @@ +<decorators defaultdir="/WEB-INF/decorators"> + <excludes> + <pattern>/css/*</pattern> + <pattern>/img/*</pattern> + </excludes> + + <decorator name="layout-login" page="layout-login.jsp"> + <pattern>/authentication/login*</pattern> + </decorator> + + <decorator name="layout" page="layout.jsp"> + <pattern>/*</pattern> + </decorator> +</decorators> Property changes on: trunk/wao-web/src/main/webapp/WEB-INF/decorators.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: trunk/wao-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/wao-web/src/main/webapp/WEB-INF/web.xml 2014-01-24 14:14:56 UTC (rev 1679) @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + metadata-complete="true"> + + <display-name>Wao ${project.version}</display-name> + + <session-config> + <session-timeout>600</session-timeout> + </session-config> + +  + <filter> + <filter-name>ExpiresFilter</filter-name> + <filter-class>org.apache.catalina.filters.ExpiresFilter</filter-class> + <init-param> + <param-name>ExpiresByType image</param-name> + <param-value>access plus 10 minutes</param-value> + </init-param> + <init-param> + <param-name>ExpiresByType text/css</param-name> + <param-value>access plus 10 minutes</param-value> + </init-param> + <init-param> + <param-name>ExpiresByType application/javascript</param-name> + <param-value>access plus 10 minutes</param-value> + </init-param> + </filter> + + <filter> + <filter-name>shiro</filter-name> + <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class> + </filter> + + <filter> + <filter-name>struts-prepare</filter-name> + <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class> + </filter> + + <filter> + <filter-name>sitemesh</filter-name> + <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class> + </filter> + + <filter> + <filter-name>struts-execute</filter-name> + <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>struts-prepare</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + +  + <filter-mapping> + <filter-name>shiro</filter-name> + <url-pattern>/*</url-pattern> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>ERROR</dispatcher> + </filter-mapping> + + <filter-mapping> + <filter-name>sitemesh</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>struts-execute</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <listener> + <description>Init</description> + <listener-class>fr.ifremer.wao.web.WaoApplicationListener</listener-class> + </listener> + + <listener> + <description>Shiro</description> + <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class> + </listener> + + <filter-mapping> + <filter-name>ExpiresFilter</filter-name> + <url-pattern>/*</url-pattern> + <dispatcher>REQUEST</dispatcher> + </filter-mapping> + +</web-app> Property changes on: trunk/wao-web/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Added: svn:mime-type + text/xml

1 0

r1678 - trunk/wao-persistence/src/main/resources/i18n
by bleny＠users.forge.codelutin.com 24 Jan '14

24 Jan '14

Author: bleny Date: 2014-01-24 15:13:31 +0100 (Fri, 24 Jan 2014) New Revision: 1678 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1678 Log: rename persistence i18n bundles Added: trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties Removed: trunk/wao-persistence/src/main/resources/i18n/wao-business_en_GB.properties trunk/wao-persistence/src/main/resources/i18n/wao-business_fr_FR.properties Deleted: trunk/wao-persistence/src/main/resources/i18n/wao-business_en_GB.properties =================================================================== --- trunk/wao-persistence/src/main/resources/i18n/wao-business_en_GB.properties 2014-01-24 10:41:09 UTC (rev 1677) +++ trunk/wao-persistence/src/main/resources/i18n/wao-business_en_GB.properties 2014-01-24 14:13:31 UTC (rev 1678) @@ -1,327 +0,0 @@ -ContactPieChartConstant.OTHER=Others -ContactPieChartConstant.REALIZED=Realized -ContactPieChartConstant.REFUSED=Refused -ContactState.CONTACT_DEFINITELY_REFUSED=Definitely refused -ContactState.CONTACT_REFUSED=Refused -ContactState.CONTACT_START=Contact started -ContactState.OBSERVATION_CANCELLED=Cancelled -ContactState.OBSERVATION_DONE=Observation done -ContactState.OBSERVATION_EXPECTED=Observation expected -ContactState.OBSERVATION_NOT_DONE=Not observed -DataReliability.CORRECTION_ASKED=Correction asked -DataReliability.DOUBTFUL=Doubtful -DataReliability.NOT_PROVIDED=Not provided -DataReliability.NOT_RELIABLE=Non reliable -DataReliability.RELIABLE=Reliable -DataReliability.UNKNOWN=Unknown -GlobalIndicatorValue.BAD=Level 1 penalty -GlobalIndicatorValue.GOOD=Level 1 bonus -GlobalIndicatorValue.NEUTRAL=Conform -GlobalIndicatorValue.VERY_BAD=Level 2 penalty -GlobalIndicatorValue.VERY_GOOD=Level 2 bonus -LocationType.AUCTION=Auction -LocationType.DISTRICT=District -LocationType.PORT=Port -LocationType.REGION=Region -ObsProgram.OBSDEB=ObsDeb -ObsProgram.OBSMER=ObsMer -ObsProgram.OBSVENTE=ObsVente -ObservationType.FIELD_WORK_OBSERVATION=Field work observation -ObservationType.FIELD_WORK_SURVEY=Field work survey -ObservationType.PHONE_CALL=Survey by phone -ObservedDataControl.ACCEPTED= -ObservedDataControl.CORRECTION_ASKED= -SamplingStrategy.SIMULTANEOUS_ALL_SPECIES=Simultaneous \: All commercial species -SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES=Simultaneous \: G1+G2 species -SamplingStrategy.SIMULTANEOUS_G1_SPECIES=Simultaneous \: G1 species -SamplingStrategy.SPECIFIC_STOCK=Specific stock -SynthesisId.DISTINCT_BOATS_COUNTS=Counts of distinct boat observed -SynthesisId.GRAPH_BOARDING=Boarding conformance rate on a given boat -SynthesisId.GRAPH_SAMPLING=Sampling plan completion rate -SynthesisId.IND_ALLEGRO_REACTIVITY=Data input delay -SynthesisId.IND_COMPLIANCE_BOARDING=Number of observers conformance -SynthesisId.IND_CONTACT_STATE=Contacts states -SynthesisId.IND_DATA_RELIABILITY=Data reliability -SynthesisId.OBSERVATION_HOUR=Hours of observation in the day -UserRole.ADMIN=Administrator -UserRole.COORDINATOR=Coordinator -UserRole.GUEST=Guest -UserRole.OBSERVER=Observer -UserRole.PROFESSIONAL=Professional -csv.import.error.missingMandatoryHeaders=The mandatory fields %s are missing -csv.import.error.unableToParseValue=Unable to parse value '%s' (column '%s', line %s) -csv.import.error.unableToReadField=Unable to read value of column '%s' at line %s -csv.import.error.unableToReadLine=Unable to read line %s -csv.import.error.unableToSetValue=Unable to set value '%s' (entity '%s', line %s, column '%s') -csv.import.error.unrecognizedHeaders=Fields %s are not recognized. Accepted fields are %s. -csv.import.logComment=Edited through import -fr.ifremer.wao.entity.Boat=Boats -fr.ifremer.wao.entity.BoatGroup=Boat groups -fr.ifremer.wao.entity.ContactStateMotif=Refusal movites -fr.ifremer.wao.entity.FishingGearDCF.=Not specified -fr.ifremer.wao.entity.FishingGearDCF.DRB=Boat dredges -fr.ifremer.wao.entity.FishingGearDCF.DRH=Hand dredges -fr.ifremer.wao.entity.FishingGearDCF.FAR=Aerial traps -fr.ifremer.wao.entity.FishingGearDCF.FCN=Cast nets -fr.ifremer.wao.entity.FishingGearDCF.FG=Falling gear (not specified) -fr.ifremer.wao.entity.FishingGearDCF.FIX=Traps (not specified) -fr.ifremer.wao.entity.FishingGearDCF.FPN=Stationary uncovered pound nets -fr.ifremer.wao.entity.FishingGearDCF.FPO=Pots -fr.ifremer.wao.entity.FishingGearDCF.FSN=Stow nets -fr.ifremer.wao.entity.FishingGearDCF.FWR=Barriers, fences, weirs, etc. -fr.ifremer.wao.entity.FishingGearDCF.FYK=Fyke nets -fr.ifremer.wao.entity.FishingGearDCF.GEN=Gillnets and entangling nets (not specified) -fr.ifremer.wao.entity.FishingGearDCF.GN=Gillnets (not specified) -fr.ifremer.wao.entity.FishingGearDCF.GNC=Encircling gillnets -fr.ifremer.wao.entity.FishingGearDCF.GND=Driftnets -fr.ifremer.wao.entity.FishingGearDCF.GNF=Fixed gillnets -fr.ifremer.wao.entity.FishingGearDCF.GNS=Set gillnets (anchored) -fr.ifremer.wao.entity.FishingGearDCF.GT=Gillnetters -fr.ifremer.wao.entity.FishingGearDCF.GTN=Combined gillnets-trammel nets -fr.ifremer.wao.entity.FishingGearDCF.GTR=Trammel nets -fr.ifremer.wao.entity.FishingGearDCF.HAR=Harpoons -fr.ifremer.wao.entity.FishingGearDCF.HMD=Mechanized dredges -fr.ifremer.wao.entity.FishingGearDCF.HMP=Pumps -fr.ifremer.wao.entity.FishingGearDCF.HMX=Harvesting machines (not specified) -fr.ifremer.wao.entity.FishingGearDCF.LA=Wihtout purse lines (lampara) -fr.ifremer.wao.entity.FishingGearDCF.LHM=Handlines and pole-lines (mechanized) -fr.ifremer.wao.entity.FishingGearDCF.LHP=Handlines and pole-lines (hand-operated) -fr.ifremer.wao.entity.FishingGearDCF.LL=Longlines (not specified) -fr.ifremer.wao.entity.FishingGearDCF.LLD=Drifting longlines -fr.ifremer.wao.entity.FishingGearDCF.LLS=Set longlines -fr.ifremer.wao.entity.FishingGearDCF.LN=Lift nets (not specified) -fr.ifremer.wao.entity.FishingGearDCF.LNB=Boat-operated lift nets -fr.ifremer.wao.entity.FishingGearDCF.LNP=Portable lift nets -fr.ifremer.wao.entity.FishingGearDCF.LNS=Shore-operated stationary lift nets -fr.ifremer.wao.entity.FishingGearDCF.LTL=Trolling lines -fr.ifremer.wao.entity.FishingGearDCF.LX=Hooks and lines (not specified) -fr.ifremer.wao.entity.FishingGearDCF.MIS=Miscellaneous -fr.ifremer.wao.entity.FishingGearDCF.NK=Gear not know or not specified -fr.ifremer.wao.entity.FishingGearDCF.OT=Otter trawls (not specified) -fr.ifremer.wao.entity.FishingGearDCF.OTB=Otter trawls -fr.ifremer.wao.entity.FishingGearDCF.OTM=Otter trawls -fr.ifremer.wao.entity.FishingGearDCF.OTT=Other twin trawls -fr.ifremer.wao.entity.FishingGearDCF.PS=With purse lines (purse seines) -fr.ifremer.wao.entity.FishingGearDCF.PS1=One boat operated purse seines -fr.ifremer.wao.entity.FishingGearDCF.PS2=Tow boats operated purse seines -fr.ifremer.wao.entity.FishingGearDCF.PT=Pair trawls (not specified) -fr.ifremer.wao.entity.FishingGearDCF.PTB=Pair trawls -fr.ifremer.wao.entity.FishingGearDCF.PTM=Pair trawls -fr.ifremer.wao.entity.FishingGearDCF.RG=Recreational fishing gear -fr.ifremer.wao.entity.FishingGearDCF.SB=Beach seines -fr.ifremer.wao.entity.FishingGearDCF.SDN=Danish seines -fr.ifremer.wao.entity.FishingGearDCF.SPR=Pair seines -fr.ifremer.wao.entity.FishingGearDCF.SSC=Scottish seines -fr.ifremer.wao.entity.FishingGearDCF.SV=Boat or vessel seines -fr.ifremer.wao.entity.FishingGearDCF.SW=Seine nets (not specified) -fr.ifremer.wao.entity.FishingGearDCF.TB=Bottom trawls (not specified) -fr.ifremer.wao.entity.FishingGearDCF.TBB=Beam trawls -fr.ifremer.wao.entity.FishingGearDCF.TBN=Nephrops trawls -fr.ifremer.wao.entity.FishingGearDCF.TBS=Shrimp trawls -fr.ifremer.wao.entity.FishingGearDCF.TM=Midwater trawls (not specified) -fr.ifremer.wao.entity.FishingGearDCF.TMS=Shrimp trawls -fr.ifremer.wao.entity.FishingGearDCF.TX=Other trawls (not specified) -fr.ifremer.wao.entity.FishingZone=Fishing zones -fr.ifremer.wao.entity.ObsDebCode=ObsDeb codes -fr.ifremer.wao.entity.TargetSpeciesDCF.=Not specified -fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algae -fr.ifremer.wao.entity.TargetSpeciesDCF.ANA=Espèces anadromes -fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Catadromous species -fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustacean -fr.ifremer.wao.entity.TargetSpeciesDCF.CRW=Langouste -fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Scallop -fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Demersal species -fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Deep water species -fr.ifremer.wao.entity.TargetSpeciesDCF.FIF=Finfish -fr.ifremer.wao.entity.TargetSpeciesDCF.FIN=Flatfishes -fr.ifremer.wao.entity.TargetSpeciesDCF.LP=Tall pelagic -fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Tall pelagic -fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Molluscs -fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Small pelagic -fr.ifremer.wao.entity.TerrestrialDivision=Terrestrial divisions -fr.ifremer.wao.entity.TerrestrialLocation=Terrestrial locations -wao.business.boat.validation.immatriculation.wrongFormat=The boat registry number must be composed of 6 digits -wao.business.contact.validation.commentAdminNecessaryForDataReliability=You must precise in admin comment why data reliability is '%s' -wao.business.contact.validation.commentMissingForState=You must give a comment for state '%s' -wao.business.contact.validation.contactStateMotifMissing=You must precise a motif for the refusal -wao.business.contact.validation.contactStateMotifUnwanted=You must not give a motif -wao.business.contact.validation.dataReliabilityMissingForValidation=You must provide data reliability before validating -wao.business.contact.validation.missingHoursOfBeginEndObservation=You must provide accurate time for the beginning and the end of observation -wao.business.contact.validation.observedDataControlMissingForValidation=You must provide a value for observed data control -wao.business.contact.validation.restitutionMissingForValidation=You must provide the restitution forward date -wao.business.entity.UserProfile.description=%s on %s%s -wao.business.mammalsCapture.mail.message=Hello,\n\nAn observer of the ObsMer program provided to WAO the following information\:\n\nTide\: %s\nProfession\: %s\n\nAccidental capture\:\n%s\n\nBest regards,\n\nObsmer program\nhttp\://www.ifremer.fr/wao -wao.business.mammalsCapture.mail.subject=Obsmer WAO\: Information about an accidental capture -wao.business.other=Other -wao.business.readOnly=(read-only) -wao.error.boat.canCreateContact= -wao.error.boat.getNbBoarding= -wao.error.boatInfos.getNbBoardingForCompany= -wao.error.context.close= -wao.error.context.encodeString= -wao.error.context.getRootContext= -wao.error.context.parse= -wao.error.context.rollback= -wao.error.context.start= -wao.error.context.stop= -wao.error.global.createDefaultAdmin= -wao.error.sampleMonth.addRealTideTime= -wao.error.sampleRow.saveSampleRowLog= -wao.error.serviceBoat.createUpdateCompanyBoatInfos= -wao.error.serviceBoat.exportBoatCsv= -wao.error.serviceBoat.getActivityCalendarLogAccessFile= -wao.error.serviceBoat.getActivityCalendarLogFile= -wao.error.serviceBoat.getAllActiveBoats= -wao.error.serviceBoat.getBoat= -wao.error.serviceBoat.getBoatNamesStartWith= -wao.error.serviceBoat.getBoatsByFilter= -wao.error.serviceBoat.getBoatsByImmatriculations= -wao.error.serviceBoat.getCompanyBoatInfos= -wao.error.serviceBoat.getLastActivityCalendar= -wao.error.serviceBoat.getNbBoatsByFilter= -wao.error.serviceBoat.getPossibleValuesForFilter= -wao.error.serviceBoat.getShipOwnerNamesContains= -wao.error.serviceBoat.importActivityCalendarCsv= -wao.error.serviceBoat.importBoatCsv= -wao.error.serviceBoat.importBoatGroups= -wao.error.serviceBoat.newBoatFilter= -wao.error.serviceCartography.exportContactMotifsStatisticsKml= -wao.error.serviceCartography.exportContactStatisticsBySeaboardKml= -wao.error.serviceCartography.exportContactStatisticsKml= -wao.error.serviceCartography.importBoatDistrictKml= -wao.error.serviceChart.getContactPieChartData= -wao.error.serviceChart.getContactPieChartUrl= -wao.error.serviceContact.exportContactCsv= -wao.error.serviceContact.getContact= -wao.error.serviceContact.getContacts= -wao.error.serviceContact.getNbContacts= -wao.error.serviceContact.getNewContact= -wao.error.serviceContact.getPossibleObsDebCodes= -wao.error.serviceContact.getPossibleTerrestrialLocations= -wao.error.serviceContact.getPossibleValuesForFilter= -wao.error.serviceContact.getSubstitutesForBoat= -wao.error.serviceContact.importContactCsv= -wao.error.serviceContact.isBoatSampled= -wao.error.serviceContact.newContact= -wao.error.serviceContact.newContactFilter= -wao.error.serviceContact.saveComment= -wao.error.serviceContact.saveContact= -wao.error.serviceContact.sendContactDoneEmail= -wao.error.serviceContact.updateSampleMonthTidesValue= -wao.error.serviceContact.validateContact= -wao.error.serviceNews.getNewNews= -wao.error.serviceNews.getNews= -wao.error.serviceNews.newNews= -wao.error.serviceNews.saveNews= -wao.error.serviceReferential.getAllContactStateMotifs= -wao.error.serviceReferential.getAllFishingGearDCFs= -wao.error.serviceReferential.getAllObsDebCodes= -wao.error.serviceReferential.getAllObservationUnits= -wao.error.serviceReferential.getAllPorts= -wao.error.serviceReferential.getAllPortsAndAuctions= -wao.error.serviceReferential.getAllRegionIfremers= -wao.error.serviceReferential.getAllTargetSpeciesDCFs= -wao.error.serviceReferential.getAllTerrestrialDistricts= -wao.error.serviceReferential.getAllTerrestrialLocations= -wao.error.serviceReferential.getCodesDCF5Contains= -wao.error.serviceReferential.getFacades= -wao.error.serviceReferential.getFishingZones= -wao.error.serviceReferential.getProfessions= -wao.error.serviceReferential.getReferentialMeta= -wao.error.serviceReferential.getReferentialStates= -wao.error.serviceReferential.getSectors= -wao.error.serviceReferential.getTerrestrialDistrict= -wao.error.serviceReferential.importContactStateMotifs= -wao.error.serviceReferential.importContactStateMotives= -wao.error.serviceReferential.importDCFcodes= -wao.error.serviceReferential.importFishingZoneCsv= -wao.error.serviceReferential.importInitialContactStateMotifs= -wao.error.serviceReferential.importObsDebCodes= -wao.error.serviceReferential.importTerrestrialDivisions= -wao.error.serviceReferential.importTerrestrialLocations= -wao.error.serviceReferential.initialImport= -wao.error.serviceReferential.updateAllContactStatesMotifs= -wao.error.serviceReferential.updateReferentialMeta= -wao.error.serviceSampling.countSampleRows= -wao.error.serviceSampling.createSampleRowLog= -wao.error.serviceSampling.createUpdateSampleRow= -wao.error.serviceSampling.deleteSampleRow= -wao.error.serviceSampling.exportSamplingPlanCsv= -wao.error.serviceSampling.exportSamplingPlanICalendar= -wao.error.serviceSampling.getDCFGears= -wao.error.serviceSampling.getDCFSpecies= -wao.error.serviceSampling.getNewProfession= -wao.error.serviceSampling.getNewSampleMonth= -wao.error.serviceSampling.getNewSampleRow= -wao.error.serviceSampling.getNewSampleRowCode= -wao.error.serviceSampling.getNewSampleRowLog= -wao.error.serviceSampling.getObservationTimesInDays= -wao.error.serviceSampling.getPossibleValuesForFilter= -wao.error.serviceSampling.getPrograms= -wao.error.serviceSampling.getSampleRow= -wao.error.serviceSampling.getSampleRowByCode= -wao.error.serviceSampling.getSampleRowsByFilter= -wao.error.serviceSampling.getSampleRowsForEligibility= -wao.error.serviceSampling.getSampleRowsOrderedByFishingZone= -wao.error.serviceSampling.importSamplingPlanCsv= -wao.error.serviceSampling.newOperation= -wao.error.serviceSampling.newSampleRow= -wao.error.serviceSampling.newSamplingFilter= -wao.error.serviceSampling.validateSampleRow= -wao.error.serviceSynthesis.getAllIndicatorLogs= -wao.error.serviceSynthesis.getBoardingBoats= -wao.error.serviceSynthesis.getBoatsCount= -wao.error.serviceSynthesis.getComplianceBoardingIndicator= -wao.error.serviceSynthesis.getContactDataInputDateReactivity= -wao.error.serviceSynthesis.getContactPieChartData= -wao.error.serviceSynthesis.getContactPieChartDataByBoatDistrict= -wao.error.serviceSynthesis.getContactStateMotifsPieChartDataByBoatDistrict= -wao.error.serviceSynthesis.getContactStateStatistics= -wao.error.serviceSynthesis.getDataReliability= -wao.error.serviceSynthesis.getDataSampling= -wao.error.serviceSynthesis.getDistinctBoatsCounts= -wao.error.serviceSynthesis.getGlobalSynthesisParameters=Unable to get data about global synthesis parameters -wao.error.serviceSynthesis.getGlobalSynthesisResult= -wao.error.serviceSynthesis.getNonComplianceBoardingIndicator= -wao.error.serviceSynthesis.getObservationHours= -wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Unable to update global synthesis parameters -wao.error.serviceUser.acceptCgu= -wao.error.serviceUser.addTokensToAllProfiles= -wao.error.serviceUser.connect= -wao.error.serviceUser.createDefaultAdmin= -wao.error.serviceUser.createUpdateCompany= -wao.error.serviceUser.createUpdateUser= -wao.error.serviceUser.deleteCompany= -wao.error.serviceUser.deleteUser= -wao.error.serviceUser.existLogin= -wao.error.serviceUser.forgetPassword= -wao.error.serviceUser.getCompanies= -wao.error.serviceUser.getCompany= -wao.error.serviceUser.getConnectedUserByToken= -wao.error.serviceUser.getNewUser= -wao.error.serviceUser.getObservers= -wao.error.serviceUser.getUserByToken= -wao.error.serviceUser.getUserRolesByLogin= -wao.error.serviceUser.getUsersByCompany= -wao.export.ical.desc=wtih %s -wao.export.ical.title=ObsDeb Observation -wao.import.contact.failure.boatMissing=You need to precise the plate number of the boat associated to the contact -wao.import.contact.failure.districtMissing=You need to precise the boat district -wao.import.contact.failure.locationTypeMissing=The type of the location must be filled -wao.import.contact.failure.sampleRowCodeMissing=The code of the sample row line is missing -wao.import.contact.failure.terrestrialLocationMissing=The code of the terrestrial location is missing -wao.import.contact.failure.wrongBoat=There is no boat with plate number '%s' -wao.import.contact.failure.wrongColor=The color '%s' is not a valid color. It must be composed of 6 characters without the hash (\#), see http\://en.wikipedia.org/wiki/Web_colors -wao.import.contact.failure.wrongContactStateMotifCode=The code '%s' is not a valid code -wao.import.contact.failure.wrongDistrict='%s' is not a valid boat district code -wao.import.contact.failure.wrongSampleRowCode=The is no sample row with code '%s' -wao.import.contact.failure.wrongTerrestrialLocation=There is no location of type '%s' with code '%s' -wao.import.failure.wrongLocationType='%s' is not a valid location type, allowed values are %s -wao.import.failure.wrongObsDebCode=There is no profession code having code '%s' -wao.import.failure.wrongUser=There is no user with login '%s' -wao.import.sampleRow.failure.fishingZoneMissing=You must precise at least one fishing zone -wao.import.sampleRow.failure.missingSampleRowCode=You must precise a code for the sample row -wao.import.sampleRow.failure.wrongFishingZone=There is no fishing zone with the code '%s' -wao.import.sampleRow.failure.wrongSampleRowCodeFormat=The sample row code '%s' is not compliant with the format "YYYY_PIIII" -wao.validation.sampleRow.conflictOnObserver=Observer %s cannot be associated to the line %s because he has to observer, on the same day, for row %s -wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s Deleted: trunk/wao-persistence/src/main/resources/i18n/wao-business_fr_FR.properties =================================================================== --- trunk/wao-persistence/src/main/resources/i18n/wao-business_fr_FR.properties 2014-01-24 10:41:09 UTC (rev 1677) +++ trunk/wao-persistence/src/main/resources/i18n/wao-business_fr_FR.properties 2014-01-24 14:13:31 UTC (rev 1678) @@ -1,326 +0,0 @@ -ContactPieChartConstant.OTHER=Autres -ContactPieChartConstant.REALIZED=Réalisés -ContactPieChartConstant.REFUSED=Refusés -ContactState.CONTACT_DEFINITELY_REFUSED=Refus définitif -ContactState.CONTACT_REFUSED=Refus -ContactState.CONTACT_START=Contact pris -ContactState.OBSERVATION_CANCELLED=Annulée -ContactState.OBSERVATION_DONE=Observation réalisée -ContactState.OBSERVATION_EXPECTED=Observation programmée -ContactState.OBSERVATION_NOT_DONE=Non observé -DataReliability.CORRECTION_ASKED=Correction demandée -DataReliability.DOUBTFUL=Douteuse -DataReliability.NOT_PROVIDED=Non contrôlée -DataReliability.NOT_RELIABLE=Non exploitable -DataReliability.RELIABLE=Exploitable -DataReliability.UNKNOWN=Inconnue -GlobalIndicatorValue.BAD=Pénalité de niveau 1 -GlobalIndicatorValue.GOOD=Bonus de niveau 1 -GlobalIndicatorValue.NEUTRAL=Conforme au cahier des charges -GlobalIndicatorValue.VERY_BAD=Pénalité de niveau 2 -GlobalIndicatorValue.VERY_GOOD=Bonus de niveau 2 -LocationType.AUCTION=Criée -LocationType.DISTRICT=Quartier maritime -LocationType.PORT=Port -LocationType.REGION=Région Ifremer -ObsProgram.OBSDEB=ObsDeb -ObsProgram.OBSMER=ObsMer -ObsProgram.OBSVENTE=ObsVente -ObservationType.FIELD_WORK_OBSERVATION=Observation de terrain -ObservationType.FIELD_WORK_SURVEY=Enquête de terrain -ObservationType.PHONE_CALL=Enquête téléphonique -ObservedDataControl.ACCEPTED=Valide -ObservedDataControl.CORRECTION_ASKED=Correction demandée -SamplingStrategy.SIMULTANEOUS_ALL_SPECIES=Simultané \: Toutes espèces commerciales -SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES=Simultané \: espèces G1+G2 -SamplingStrategy.SIMULTANEOUS_G1_SPECIES=Simultané \: espèces G1 -SamplingStrategy.SPECIFIC_STOCK=Stock spécifique -SynthesisId.DISTINCT_BOATS_COUNTS=Nombres de navires distincts observés -SynthesisId.GRAPH_BOARDING=Taux d'embarquement sur un même navire conforme aux exigences -SynthesisId.GRAPH_SAMPLING=Taux de réalisation du plan d'échantillonage -SynthesisId.IND_ALLEGRO_REACTIVITY=Délais de transmission des données -SynthesisId.IND_COMPLIANCE_BOARDING=Respect du nombre d'observateurs embarqués -SynthesisId.IND_CONTACT_STATE=États des contacts -SynthesisId.IND_DATA_RELIABILITY=Qualité de la donnée -SynthesisId.OBSERVATION_HOUR=Heures d'observation dans la journée -UserRole.ADMIN=Administrateur -UserRole.COORDINATOR=Coordinateur -UserRole.GUEST=Invité -UserRole.OBSERVER=Observateur -UserRole.PROFESSIONAL=Professionnel -csv.import.error.missingMandatoryHeaders=Les champs obligatoires %s sont manquants -csv.import.error.unableToParseValue=Erreur lors de l'interprétation de la valeur '%s' (colonne '%s', ligne %s) -csv.import.error.unableToReadField=Impossible de lire la colonne '%s' à la ligne %s -csv.import.error.unableToReadLine=Impossible de lire la ligne %s -csv.import.error.unableToSetValue=Impossible d'enregistrer la valeur '%s' (entité '%s', ligne %s, column '%s') -csv.import.error.unrecognizedHeaders=Les champs %s ne sont pas reconnus. Les champs possibles sont %s. -csv.import.logComment=Modification depuis import -fr.ifremer.wao.entity.Boat=Navires -fr.ifremer.wao.entity.BoatGroup=Stratification des navires -fr.ifremer.wao.entity.ContactStateMotif=Motifs de refus -fr.ifremer.wao.entity.FishingGearDCF.=Non spécifié -fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorquées par bateau -fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues à main -fr.ifremer.wao.entity.FishingGearDCF.FAR=Pièges aériens -fr.ifremer.wao.entity.FishingGearDCF.FCN=Éperviers -fr.ifremer.wao.entity.FishingGearDCF.FG=Autres engins retombants (non-spécifiés) -fr.ifremer.wao.entity.FishingGearDCF.FIX=Pièges (non-spécifiés) -fr.ifremer.wao.entity.FishingGearDCF.FPN=Filets-pièges fixes non couverts -fr.ifremer.wao.entity.FishingGearDCF.FPO=Nasses (casiers) -fr.ifremer.wao.entity.FishingGearDCF.FSN=Filets à l'étalage (diables) -fr.ifremer.wao.entity.FishingGearDCF.FWR=Barrages, parcs, bordigues, etc. -fr.ifremer.wao.entity.FishingGearDCF.FYK=Verveux -fr.ifremer.wao.entity.FishingGearDCF.GEN=Filets maillants et filets emmélants (non spécifiés) -fr.ifremer.wao.entity.FishingGearDCF.GES=Tamis à civelles -fr.ifremer.wao.entity.FishingGearDCF.GN=Filets maillants (non spécifiés) -fr.ifremer.wao.entity.FishingGearDCF.GNC=Filets maillants encerclants -fr.ifremer.wao.entity.FishingGearDCF.GND=Filets maillants dérivants (filets dérivants) -fr.ifremer.wao.entity.FishingGearDCF.GNF=Filets maillants fixes (sur perches) -fr.ifremer.wao.entity.FishingGearDCF.GNS=Filets maillants calés (ancrés) -fr.ifremer.wao.entity.FishingGearDCF.GT=Trémailleurs -fr.ifremer.wao.entity.FishingGearDCF.GTN=Trémails et filets maillants combinés -fr.ifremer.wao.entity.FishingGearDCF.GTR=Trémails -fr.ifremer.wao.entity.FishingGearDCF.HAR=Harpons -fr.ifremer.wao.entity.FishingGearDCF.HMD=Dragues mécanisées -fr.ifremer.wao.entity.FishingGearDCF.HMP=Pompes -fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de récolte (non spécifiés) -fr.ifremer.wao.entity.FishingGearDCF.LA=Filets tournants sans coulisse (filet lamparo) -fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes à main et lignes avec cannes (mécanisées) -fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes à main et lignes à cannes (manœuvrées à la main) -fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non spécifiées) -fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres dérivantes -fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres calées ou semi-flottantes -fr.ifremer.wao.entity.FishingGearDCF.LN=Filets soulevés (non spécifiés) -fr.ifremer.wao.entity.FishingGearDCF.LNB=Filets soulevés manœuvrées du bateau -fr.ifremer.wao.entity.FishingGearDCF.LNP=Filets soulevés portatifs -fr.ifremer.wao.entity.FishingGearDCF.LNS=Filets soulevés fixes manœuvrées du rivage -fr.ifremer.wao.entity.FishingGearDCF.LTL=lignes de traîne -fr.ifremer.wao.entity.FishingGearDCF.LX=Lignes et palangres -fr.ifremer.wao.entity.FishingGearDCF.MIS=Divers -fr.ifremer.wao.entity.FishingGearDCF.NK=Engins inconnus ou non spécifiés -fr.ifremer.wao.entity.FishingGearDCF.OT=Chaluts à panneaux (non spécifié) -fr.ifremer.wao.entity.FishingGearDCF.OTB=Chalut de fond à panneaux -fr.ifremer.wao.entity.FishingGearDCF.OTM=Chaluts pélagiques à panneaux -fr.ifremer.wao.entity.FishingGearDCF.OTT=Chaluts jumeaux à panneaux -fr.ifremer.wao.entity.FishingGearDCF.PS=Filets tournants avec coulisse (sennes coulissantes) -fr.ifremer.wao.entity.FishingGearDCF.PS1=Filets tournants, sennes coulissantes manœuvrées par un bateau -fr.ifremer.wao.entity.FishingGearDCF.PS2=Filets tournants, sennes coulissantes manœuvrées par deux bateaux -fr.ifremer.wao.entity.FishingGearDCF.PT=Chalut-bœufs (non spécifié) -fr.ifremer.wao.entity.FishingGearDCF.PTB=Chalut-bœufs de fond -fr.ifremer.wao.entity.FishingGearDCF.PTM=Chalut-bœufs pélagiques -fr.ifremer.wao.entity.FishingGearDCF.RG=Engins de pêche révréative -fr.ifremer.wao.entity.FishingGearDCF.SB=Sennes de plages -fr.ifremer.wao.entity.FishingGearDCF.SDN=Sennes danoises -fr.ifremer.wao.entity.FishingGearDCF.SPR=Sennes manœuvrées par deux bateaux -fr.ifremer.wao.entity.FishingGearDCF.SSC=Sennes écossaises -fr.ifremer.wao.entity.FishingGearDCF.SV=Sennes halées à bord -fr.ifremer.wao.entity.FishingGearDCF.SW=Sennes (non spécifiées) -fr.ifremer.wao.entity.FishingGearDCF.TB=Chalut de fond (non spécifié) -fr.ifremer.wao.entity.FishingGearDCF.TBB=Chaluts à perche -fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut à langoustines -fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut à crevettes -fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut pélagique (non spécifié) -fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut pélagique à crevettes -fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non spécifié) -fr.ifremer.wao.entity.FishingZone=Zones de pêche -fr.ifremer.wao.entity.ObsDebCode=Codes métiers ObsDeb -fr.ifremer.wao.entity.TargetSpeciesDCF.=Non spécifié -fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algues -fr.ifremer.wao.entity.TargetSpeciesDCF.ANA=Espèces anadromes -fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Espèces catadromes -fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustacés -fr.ifremer.wao.entity.TargetSpeciesDCF.CRW=Langouste -fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Coquilles Saint-Jacques -fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Espèces démersales -fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Espèces d'eaux profondes -fr.ifremer.wao.entity.TargetSpeciesDCF.FIF=Poissons -fr.ifremer.wao.entity.TargetSpeciesDCF.FIN=Poisson plats -fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands pélagiques -fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Mollusques -fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits pélagiques -fr.ifremer.wao.entity.TerrestrialDivision=Stratification géographique -fr.ifremer.wao.entity.TerrestrialLocation=Lieux terrestres -wao.business.boat.validation.immatriculation.wrongFormat=L'immatriculation du navire doit être formée de 6 chiffres -wao.business.contact.validation.commentAdminNecessaryForDataReliability=Il faut préciser dans le commentaire administrateur pourquoi la donnée est '%s' -wao.business.contact.validation.commentMissingForState=Il faut préciser un commentaire pour l'état '%s' -wao.business.contact.validation.contactStateMotifMissing=Il faut préciser un motif de refus -wao.business.contact.validation.contactStateMotifUnwanted=Il ne faut pas préciser de motif de refus -wao.business.contact.validation.dataReliabilityMissingForValidation=Il faut préciser la qualité de la donnée avant de valider -wao.business.contact.validation.missingHoursOfBeginEndObservation=Il faut préciser les heures exactes de début et de fin d'observation -wao.business.contact.validation.observedDataControlMissingForValidation=Il faut préciser une valeur pour le contrôle des données observées -wao.business.contact.validation.restitutionMissingForValidation=Il faut préciser une date de transmission de la restitution de la donnée avant de valider -wao.business.entity.UserProfile.description=%s sur %s%s -wao.business.mammalsCapture.mail.message=Bonjour,\n\nUn observateur du programme Obsmer a renseigné dans WAO l'information suivante \:\n\nMarée \: %s\nMétier \: %s\n\nCapture accidentelle \:\n%s\n\nCordialement,\n\nLe programme Obsmer\nhttp\://www.ifremer.fr/wao -wao.business.mammalsCapture.mail.subject=Obsmer WAO\: Information sur capture accidentelle -wao.business.other=Autre -wao.business.readOnly=(lecture seule) -wao.error.boat.canCreateContact=Impossible de créer un nouveau contact pour la société %1$s et le navire %2$s (%3$d) -wao.error.boat.getNbBoarding=Impossible de récupérer le nombre d'embarquements réels depuis le %1$s -wao.error.boatInfos.getNbBoardingForCompany=Impossible de récupérer le nombre d'embarquements réels depuis le %1$s pour la société %2$s -wao.error.context.close=Une erreur est survenue pendant la fermeture du contexte principale de ToPIA -wao.error.context.encodeString= -wao.error.context.getRootContext=Une erreur est survenue pour la récupération du contexte principale de ToPIA -wao.error.context.parse=Une erreur est survenue pendant le chargement de la configuration du fichier %1$s -wao.error.context.rollback=Une erreur est survenue pendant l'annulation de la transaction courante -wao.error.context.start=Une erreur est survenue pendant le démarrage de l'application -wao.error.context.stop=Une erreur est survenue pendant la fermeture de l'application -wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de marées réels pour le mois de %1$s [ligne \: %2$s] -wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire écrit par %1$s -wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de créer ou modifier les informations liés au navire %1$d pour la société %2$s -wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires sélectionnés -wao.error.serviceBoat.getActivityCalendarLogAccessFile= -wao.error.serviceBoat.getActivityCalendarLogFile= -wao.error.serviceBoat.getAllActiveBoats= -wao.error.serviceBoat.getBoat=Impossible de charger le navire -wao.error.serviceBoat.getBoatNamesStartWith=Impossible de récupérer les navires avec un nom commencant par '%1$s' -wao.error.serviceBoat.getBoatsByFilter=Impossible de filtrer la liste des navires -wao.error.serviceBoat.getBoatsByImmatriculations=La chaîne d'immatriculations est incorrect \! Chaque immatriculation doit posséder 6 chiffres -wao.error.serviceBoat.getCompanyBoatInfos=Impossible de récupérer les informations du navire immatriculé %1$d pour la société %2$s -wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activité du navire %1$s (%2$d) -wao.error.serviceBoat.getNbBoatsByFilter=Impossible de filtrer la liste des navires -wao.error.serviceBoat.getPossibleValuesForFilter= -wao.error.serviceBoat.getShipOwnerNamesContains= -wao.error.serviceBoat.importActivityCalendarCsv=Problème d'import du fichier CSV des calendriers d'activité -wao.error.serviceBoat.importBoatCsv=Problème d'import du fichier CSV. Vérifiez l'en-tête du fichier. -wao.error.serviceBoat.importBoatGroups= -wao.error.serviceBoat.newBoatFilter= -wao.error.serviceCartography.exportContactMotifsStatisticsKml= -wao.error.serviceCartography.exportContactStatisticsBySeaboardKml= -wao.error.serviceCartography.exportContactStatisticsKml= -wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonnées des quartiers des navires. Vérifiez la documentation pour le bon format du fichier Kml. -wao.error.serviceChart.getContactPieChartData= -wao.error.serviceChart.getContactPieChartUrl= -wao.error.serviceContact.exportContactCsv=Impossible d'exporter les contacts -wao.error.serviceContact.getContact=Impossible de trouver le contact -wao.error.serviceContact.getContacts=Impossible de filtrer la liste des contacts -wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtrés -wao.error.serviceContact.getNewContact=Impossible d'instancier un nouveau contact -wao.error.serviceContact.getPossibleObsDebCodes= -wao.error.serviceContact.getPossibleTerrestrialLocations= -wao.error.serviceContact.getPossibleValuesForFilter= -wao.error.serviceContact.getSubstitutesForBoat= -wao.error.serviceContact.importContactCsv=Impossible d'importer les contacts -wao.error.serviceContact.isBoatSampled= -wao.error.serviceContact.newContact= -wao.error.serviceContact.newContactFilter= -wao.error.serviceContact.saveComment= -wao.error.serviceContact.saveContact=Impossible de sauvegarder le contact -wao.error.serviceContact.sendContactDoneEmail= -wao.error.serviceContact.updateSampleMonthTidesValue= -wao.error.serviceContact.validateContact= -wao.error.serviceNews.getNewNews= -wao.error.serviceNews.getNews=Impossible de récupérer l'ensemble des news -wao.error.serviceNews.newNews= -wao.error.serviceNews.saveNews=Impossible d'enregistrer la news ayant pour titre '%1$s' -wao.error.serviceReferential.getAllContactStateMotifs= -wao.error.serviceReferential.getAllFishingGearDCFs= -wao.error.serviceReferential.getAllObsDebCodes= -wao.error.serviceReferential.getAllObservationUnits= -wao.error.serviceReferential.getAllPorts= -wao.error.serviceReferential.getAllPortsAndAuctions= -wao.error.serviceReferential.getAllRegionIfremers= -wao.error.serviceReferential.getAllTargetSpeciesDCFs= -wao.error.serviceReferential.getAllTerrestrialDistricts= -wao.error.serviceReferential.getAllTerrestrialLocations= -wao.error.serviceReferential.getCodesDCF5Contains= -wao.error.serviceReferential.getFacades=Impossible de charger la liste des facades -wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de pêche -wao.error.serviceReferential.getProfessions=Impossible de charger la liste des métiers -wao.error.serviceReferential.getReferentialMeta= -wao.error.serviceReferential.getReferentialStates= -wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de pêche -wao.error.serviceReferential.getTerrestrialDistrict= -wao.error.serviceReferential.importContactStateMotifs= -wao.error.serviceReferential.importContactStateMotives= -wao.error.serviceReferential.importDCFcodes=Impossible de créer le référentiel des codes DCF -wao.error.serviceReferential.importFishingZoneCsv=Problème d'import du fichier CSV. Vérifiez l'en-tête du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de détails. -wao.error.serviceReferential.importInitialContactStateMotifs= -wao.error.serviceReferential.importObsDebCodes= -wao.error.serviceReferential.importTerrestrialDivisions= -wao.error.serviceReferential.importTerrestrialLocations= -wao.error.serviceReferential.initialImport= -wao.error.serviceReferential.updateAllContactStatesMotifs= -wao.error.serviceReferential.updateReferentialMeta= -wao.error.serviceSampling.countSampleRows= -wao.error.serviceSampling.createSampleRowLog= -wao.error.serviceSampling.createUpdateSampleRow=Impossible de sauvegarder la ligne d'échantillon -wao.error.serviceSampling.deleteSampleRow=Impossible de supprimer la ligne d'échantillon \: %1$s -wao.error.serviceSampling.exportSamplingPlanCsv=Impossible d'exporter le plan d'échantillonnage sur la période du %1$s au %2$s -wao.error.serviceSampling.exportSamplingPlanICalendar= -wao.error.serviceSampling.getDCFGears= -wao.error.serviceSampling.getDCFSpecies= -wao.error.serviceSampling.getNewProfession= -wao.error.serviceSampling.getNewSampleMonth= -wao.error.serviceSampling.getNewSampleRow= -wao.error.serviceSampling.getNewSampleRowCode=Impossible de récupérer un nouveau code pour une ligne d'échantillonnage -wao.error.serviceSampling.getNewSampleRowLog= -wao.error.serviceSampling.getObservationTimesInDays= -wao.error.serviceSampling.getPossibleValuesForFilter= -wao.error.serviceSampling.getPrograms=Impossible de charger la liste des programmes -wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'échantillon ayant pour identifiant \: %1$s -wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'échantillon ayant pour code %1$s -wao.error.serviceSampling.getSampleRowsByFilter=Impossible de récupérer la liste des lignes du plan d'échantillonnage -wao.error.serviceSampling.getSampleRowsForEligibility= -wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de récupérer la liste des lignes du plan d'échantillonnage -wao.error.serviceSampling.importSamplingPlanCsv=Erreur lors de l'import du plan -wao.error.serviceSampling.newOperation= -wao.error.serviceSampling.newSampleRow= -wao.error.serviceSampling.newSamplingFilter= -wao.error.serviceSampling.validateSampleRow= -wao.error.serviceSynthesis.getAllIndicatorLogs= -wao.error.serviceSynthesis.getBoardingBoats=Impossible de récupérer les données du graphique concernant les embarquements sur les navires -wao.error.serviceSynthesis.getBoatsCount= -wao.error.serviceSynthesis.getComplianceBoardingIndicator= -wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de récupérer l'indicateur de réactivité sur les dates de saisies dans Allegro -wao.error.serviceSynthesis.getContactPieChartData= -wao.error.serviceSynthesis.getContactPieChartDataByBoatDistrict= -wao.error.serviceSynthesis.getContactStateMotifsPieChartDataByBoatDistrict= -wao.error.serviceSynthesis.getContactStateStatistics=Impossible de récupérer les statistiques sur les états des contacts -wao.error.serviceSynthesis.getDataReliability= -wao.error.serviceSynthesis.getDataSampling=Impossible de récupérer les données pour le graphique dynamique des efforts de marées -wao.error.serviceSynthesis.getDistinctBoatsCounts= -wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de récupérer les données concernant les indicateurs pour la synthèse globale -wao.error.serviceSynthesis.getGlobalSynthesisResult= -wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de récupérer l'indicateur de non respect du nombre d'observateurs embarqués -wao.error.serviceSynthesis.getObservationHours= -wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre à jour les paramètres de la synthèse globale -wao.error.serviceUser.acceptCgu= -wao.error.serviceUser.addTokensToAllProfiles= -wao.error.serviceUser.connect=Une erreur est survenue lors de la demande de connexion -wao.error.serviceUser.createDefaultAdmin=Impossible de créer l'administrateur par défaut -wao.error.serviceUser.createUpdateCompany=Impossible de créer ou de mettre à jour la société -wao.error.serviceUser.createUpdateUser=Impossible de créer ou de mettre à jour l'utilisateur -wao.error.serviceUser.deleteCompany=Impossible de supprimer la société ou de vérifier les contraintes de suppression -wao.error.serviceUser.deleteUser=Impossible de supprimer l'utilisateur -wao.error.serviceUser.existLogin= -wao.error.serviceUser.forgetPassword=Impossible d'envoyer le mail d'oubli de mot de passe -wao.error.serviceUser.getCompanies=Impossible de récupérer la liste des sociétés -wao.error.serviceUser.getCompany= -wao.error.serviceUser.getConnectedUserByToken= -wao.error.serviceUser.getNewUser=Impossible d'instancier un nouvel utilisateur -wao.error.serviceUser.getObservers=Impossible de récupérer la liste des observateurs -wao.error.serviceUser.getUserByToken= -wao.error.serviceUser.getUserRolesByLogin= -wao.error.serviceUser.getUsersByCompany=Impossible de récupérer la liste des utilisateurs de la société %1$s -wao.export.ical.desc=avec %s -wao.export.ical.title=Observation ObsDeb -wao.import.contact.failure.boatMissing=Il faut préciser l'immatriculation du navire associé au contact -wao.import.contact.failure.districtMissing=Il faut préciser le code d'un quartier maritime -wao.import.contact.failure.locationTypeMissing=Le type du lieu doit être renseigné -wao.import.contact.failure.sampleRowCodeMissing=Il manque le code de la ligne de plan associée -wao.import.contact.failure.terrestrialLocationMissing=Il manque le code du lieu -wao.import.contact.failure.wrongBoat=Il n'y a pas de navire avec l'immatriculation '%s' -wao.import.contact.failure.wrongColor=Le code couleur '%s' n'est pas valide, il doit être composé de six caractères sans dièze voir http\://fr.wikipedia.org/wiki/Couleurs_du_Web -wao.import.contact.failure.wrongContactStateMotifCode=Le code '%s' n'est pas un code de motif de refus valide -wao.import.contact.failure.wrongDistrict='%s' n'est pas un code quartier maritime valide -wao.import.contact.failure.wrongSampleRowCode=Il n'y a pas de ligne du plan avec le code '%s' -wao.import.contact.failure.wrongTerrestrialLocation=Il n'y a pas de lieu de type '%s' ayant pour code '%s' -wao.import.failure.wrongLocationType='%s' n'est pas un type de lieu valide, les valeurs admises sont %s -wao.import.failure.wrongObsDebCode=Il n'y a pas de code métier ayant pour code '%s' -wao.import.failure.wrongUser=Il n'y a pas d'utilisateur ayant pour identifiant '%s' -wao.import.sampleRow.failure.fishingZoneMissing=Il faut préciser au moins une zone de pêche -wao.import.sampleRow.failure.missingSampleRowCode=Il faut préciser un code pour a ligne du plan -wao.import.sampleRow.failure.wrongFishingZone=Le code '%s' ne correspond à aucune zone de pêche connue du référentiel -wao.import.sampleRow.failure.wrongSampleRowCodeFormat=Le code '%s' n'est pas un code de ligne valide selon le format "AAAA_PIIII" -wao.validation.sampleRow.conflictOnObserver=L'observateur %s ne peut être associé à la ligne %s car il doit observer, le même jour, pour la ligne %s -wao.validation.sampleRow.observerNotInCompany=L'observateur %s ne fait pas parti de la société %s Copied: trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties (from rev 1676, trunk/wao-persistence/src/main/resources/i18n/wao-business_en_GB.properties) =================================================================== --- trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties (rev 0) +++ trunk/wao-persistence/src/main/resources/i18n/wao-persistence_en_GB.properties 2014-01-24 14:13:31 UTC (rev 1678) @@ -0,0 +1,327 @@ +ContactPieChartConstant.OTHER=Others +ContactPieChartConstant.REALIZED=Realized +ContactPieChartConstant.REFUSED=Refused +ContactState.CONTACT_DEFINITELY_REFUSED=Definitely refused +ContactState.CONTACT_REFUSED=Refused +ContactState.CONTACT_START=Contact started +ContactState.OBSERVATION_CANCELLED=Cancelled +ContactState.OBSERVATION_DONE=Observation done +ContactState.OBSERVATION_EXPECTED=Observation expected +ContactState.OBSERVATION_NOT_DONE=Not observed +DataReliability.CORRECTION_ASKED=Correction asked +DataReliability.DOUBTFUL=Doubtful +DataReliability.NOT_PROVIDED=Not provided +DataReliability.NOT_RELIABLE=Non reliable +DataReliability.RELIABLE=Reliable +DataReliability.UNKNOWN=Unknown +GlobalIndicatorValue.BAD=Level 1 penalty +GlobalIndicatorValue.GOOD=Level 1 bonus +GlobalIndicatorValue.NEUTRAL=Conform +GlobalIndicatorValue.VERY_BAD=Level 2 penalty +GlobalIndicatorValue.VERY_GOOD=Level 2 bonus +LocationType.AUCTION=Auction +LocationType.DISTRICT=District +LocationType.PORT=Port +LocationType.REGION=Region +ObsProgram.OBSDEB=ObsDeb +ObsProgram.OBSMER=ObsMer +ObsProgram.OBSVENTE=ObsVente +ObservationType.FIELD_WORK_OBSERVATION=Field work observation +ObservationType.FIELD_WORK_SURVEY=Field work survey +ObservationType.PHONE_CALL=Survey by phone +ObservedDataControl.ACCEPTED= +ObservedDataControl.CORRECTION_ASKED= +SamplingStrategy.SIMULTANEOUS_ALL_SPECIES=Simultaneous \: All commercial species +SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES=Simultaneous \: G1+G2 species +SamplingStrategy.SIMULTANEOUS_G1_SPECIES=Simultaneous \: G1 species +SamplingStrategy.SPECIFIC_STOCK=Specific stock +SynthesisId.DISTINCT_BOATS_COUNTS=Counts of distinct boat observed +SynthesisId.GRAPH_BOARDING=Boarding conformance rate on a given boat +SynthesisId.GRAPH_SAMPLING=Sampling plan completion rate +SynthesisId.IND_ALLEGRO_REACTIVITY=Data input delay +SynthesisId.IND_COMPLIANCE_BOARDING=Number of observers conformance +SynthesisId.IND_CONTACT_STATE=Contacts states +SynthesisId.IND_DATA_RELIABILITY=Data reliability +SynthesisId.OBSERVATION_HOUR=Hours of observation in the day +UserRole.ADMIN=Administrator +UserRole.COORDINATOR=Coordinator +UserRole.GUEST=Guest +UserRole.OBSERVER=Observer +UserRole.PROFESSIONAL=Professional +csv.import.error.missingMandatoryHeaders=The mandatory fields %s are missing +csv.import.error.unableToParseValue=Unable to parse value '%s' (column '%s', line %s) +csv.import.error.unableToReadField=Unable to read value of column '%s' at line %s +csv.import.error.unableToReadLine=Unable to read line %s +csv.import.error.unableToSetValue=Unable to set value '%s' (entity '%s', line %s, column '%s') +csv.import.error.unrecognizedHeaders=Fields %s are not recognized. Accepted fields are %s. +csv.import.logComment=Edited through import +fr.ifremer.wao.entity.Boat=Boats +fr.ifremer.wao.entity.BoatGroup=Boat groups +fr.ifremer.wao.entity.ContactStateMotif=Refusal movites +fr.ifremer.wao.entity.FishingGearDCF.=Not specified +fr.ifremer.wao.entity.FishingGearDCF.DRB=Boat dredges +fr.ifremer.wao.entity.FishingGearDCF.DRH=Hand dredges +fr.ifremer.wao.entity.FishingGearDCF.FAR=Aerial traps +fr.ifremer.wao.entity.FishingGearDCF.FCN=Cast nets +fr.ifremer.wao.entity.FishingGearDCF.FG=Falling gear (not specified) +fr.ifremer.wao.entity.FishingGearDCF.FIX=Traps (not specified) +fr.ifremer.wao.entity.FishingGearDCF.FPN=Stationary uncovered pound nets +fr.ifremer.wao.entity.FishingGearDCF.FPO=Pots +fr.ifremer.wao.entity.FishingGearDCF.FSN=Stow nets +fr.ifremer.wao.entity.FishingGearDCF.FWR=Barriers, fences, weirs, etc. +fr.ifremer.wao.entity.FishingGearDCF.FYK=Fyke nets +fr.ifremer.wao.entity.FishingGearDCF.GEN=Gillnets and entangling nets (not specified) +fr.ifremer.wao.entity.FishingGearDCF.GN=Gillnets (not specified) +fr.ifremer.wao.entity.FishingGearDCF.GNC=Encircling gillnets +fr.ifremer.wao.entity.FishingGearDCF.GND=Driftnets +fr.ifremer.wao.entity.FishingGearDCF.GNF=Fixed gillnets +fr.ifremer.wao.entity.FishingGearDCF.GNS=Set gillnets (anchored) +fr.ifremer.wao.entity.FishingGearDCF.GT=Gillnetters +fr.ifremer.wao.entity.FishingGearDCF.GTN=Combined gillnets-trammel nets +fr.ifremer.wao.entity.FishingGearDCF.GTR=Trammel nets +fr.ifremer.wao.entity.FishingGearDCF.HAR=Harpoons +fr.ifremer.wao.entity.FishingGearDCF.HMD=Mechanized dredges +fr.ifremer.wao.entity.FishingGearDCF.HMP=Pumps +fr.ifremer.wao.entity.FishingGearDCF.HMX=Harvesting machines (not specified) +fr.ifremer.wao.entity.FishingGearDCF.LA=Wihtout purse lines (lampara) +fr.ifremer.wao.entity.FishingGearDCF.LHM=Handlines and pole-lines (mechanized) +fr.ifremer.wao.entity.FishingGearDCF.LHP=Handlines and pole-lines (hand-operated) +fr.ifremer.wao.entity.FishingGearDCF.LL=Longlines (not specified) +fr.ifremer.wao.entity.FishingGearDCF.LLD=Drifting longlines +fr.ifremer.wao.entity.FishingGearDCF.LLS=Set longlines +fr.ifremer.wao.entity.FishingGearDCF.LN=Lift nets (not specified) +fr.ifremer.wao.entity.FishingGearDCF.LNB=Boat-operated lift nets +fr.ifremer.wao.entity.FishingGearDCF.LNP=Portable lift nets +fr.ifremer.wao.entity.FishingGearDCF.LNS=Shore-operated stationary lift nets +fr.ifremer.wao.entity.FishingGearDCF.LTL=Trolling lines +fr.ifremer.wao.entity.FishingGearDCF.LX=Hooks and lines (not specified) +fr.ifremer.wao.entity.FishingGearDCF.MIS=Miscellaneous +fr.ifremer.wao.entity.FishingGearDCF.NK=Gear not know or not specified +fr.ifremer.wao.entity.FishingGearDCF.OT=Otter trawls (not specified) +fr.ifremer.wao.entity.FishingGearDCF.OTB=Otter trawls +fr.ifremer.wao.entity.FishingGearDCF.OTM=Otter trawls +fr.ifremer.wao.entity.FishingGearDCF.OTT=Other twin trawls +fr.ifremer.wao.entity.FishingGearDCF.PS=With purse lines (purse seines) +fr.ifremer.wao.entity.FishingGearDCF.PS1=One boat operated purse seines +fr.ifremer.wao.entity.FishingGearDCF.PS2=Tow boats operated purse seines +fr.ifremer.wao.entity.FishingGearDCF.PT=Pair trawls (not specified) +fr.ifremer.wao.entity.FishingGearDCF.PTB=Pair trawls +fr.ifremer.wao.entity.FishingGearDCF.PTM=Pair trawls +fr.ifremer.wao.entity.FishingGearDCF.RG=Recreational fishing gear +fr.ifremer.wao.entity.FishingGearDCF.SB=Beach seines +fr.ifremer.wao.entity.FishingGearDCF.SDN=Danish seines +fr.ifremer.wao.entity.FishingGearDCF.SPR=Pair seines +fr.ifremer.wao.entity.FishingGearDCF.SSC=Scottish seines +fr.ifremer.wao.entity.FishingGearDCF.SV=Boat or vessel seines +fr.ifremer.wao.entity.FishingGearDCF.SW=Seine nets (not specified) +fr.ifremer.wao.entity.FishingGearDCF.TB=Bottom trawls (not specified) +fr.ifremer.wao.entity.FishingGearDCF.TBB=Beam trawls +fr.ifremer.wao.entity.FishingGearDCF.TBN=Nephrops trawls +fr.ifremer.wao.entity.FishingGearDCF.TBS=Shrimp trawls +fr.ifremer.wao.entity.FishingGearDCF.TM=Midwater trawls (not specified) +fr.ifremer.wao.entity.FishingGearDCF.TMS=Shrimp trawls +fr.ifremer.wao.entity.FishingGearDCF.TX=Other trawls (not specified) +fr.ifremer.wao.entity.FishingZone=Fishing zones +fr.ifremer.wao.entity.ObsDebCode=ObsDeb codes +fr.ifremer.wao.entity.TargetSpeciesDCF.=Not specified +fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algae +fr.ifremer.wao.entity.TargetSpeciesDCF.ANA=Espèces anadromes +fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Catadromous species +fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustacean +fr.ifremer.wao.entity.TargetSpeciesDCF.CRW=Langouste +fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Scallop +fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Demersal species +fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Deep water species +fr.ifremer.wao.entity.TargetSpeciesDCF.FIF=Finfish +fr.ifremer.wao.entity.TargetSpeciesDCF.FIN=Flatfishes +fr.ifremer.wao.entity.TargetSpeciesDCF.LP=Tall pelagic +fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Tall pelagic +fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Molluscs +fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Small pelagic +fr.ifremer.wao.entity.TerrestrialDivision=Terrestrial divisions +fr.ifremer.wao.entity.TerrestrialLocation=Terrestrial locations +wao.business.boat.validation.immatriculation.wrongFormat=The boat registry number must be composed of 6 digits +wao.business.contact.validation.commentAdminNecessaryForDataReliability=You must precise in admin comment why data reliability is '%s' +wao.business.contact.validation.commentMissingForState=You must give a comment for state '%s' +wao.business.contact.validation.contactStateMotifMissing=You must precise a motif for the refusal +wao.business.contact.validation.contactStateMotifUnwanted=You must not give a motif +wao.business.contact.validation.dataReliabilityMissingForValidation=You must provide data reliability before validating +wao.business.contact.validation.missingHoursOfBeginEndObservation=You must provide accurate time for the beginning and the end of observation +wao.business.contact.validation.observedDataControlMissingForValidation=You must provide a value for observed data control +wao.business.contact.validation.restitutionMissingForValidation=You must provide the restitution forward date +wao.business.entity.UserProfile.description=%s on %s%s +wao.business.mammalsCapture.mail.message=Hello,\n\nAn observer of the ObsMer program provided to WAO the following information\:\n\nTide\: %s\nProfession\: %s\n\nAccidental capture\:\n%s\n\nBest regards,\n\nObsmer program\nhttp\://www.ifremer.fr/wao +wao.business.mammalsCapture.mail.subject=Obsmer WAO\: Information about an accidental capture +wao.business.other=Other +wao.business.readOnly=(read-only) +wao.error.boat.canCreateContact= +wao.error.boat.getNbBoarding= +wao.error.boatInfos.getNbBoardingForCompany= +wao.error.context.close= +wao.error.context.encodeString= +wao.error.context.getRootContext= +wao.error.context.parse= +wao.error.context.rollback= +wao.error.context.start= +wao.error.context.stop= +wao.error.global.createDefaultAdmin= +wao.error.sampleMonth.addRealTideTime= +wao.error.sampleRow.saveSampleRowLog= +wao.error.serviceBoat.createUpdateCompanyBoatInfos= +wao.error.serviceBoat.exportBoatCsv= +wao.error.serviceBoat.getActivityCalendarLogAccessFile= +wao.error.serviceBoat.getActivityCalendarLogFile= +wao.error.serviceBoat.getAllActiveBoats= +wao.error.serviceBoat.getBoat= +wao.error.serviceBoat.getBoatNamesStartWith= +wao.error.serviceBoat.getBoatsByFilter= +wao.error.serviceBoat.getBoatsByImmatriculations= +wao.error.serviceBoat.getCompanyBoatInfos= +wao.error.serviceBoat.getLastActivityCalendar= +wao.error.serviceBoat.getNbBoatsByFilter= +wao.error.serviceBoat.getPossibleValuesForFilter= +wao.error.serviceBoat.getShipOwnerNamesContains= +wao.error.serviceBoat.importActivityCalendarCsv= +wao.error.serviceBoat.importBoatCsv= +wao.error.serviceBoat.importBoatGroups= +wao.error.serviceBoat.newBoatFilter= +wao.error.serviceCartography.exportContactMotifsStatisticsKml= +wao.error.serviceCartography.exportContactStatisticsBySeaboardKml= +wao.error.serviceCartography.exportContactStatisticsKml= +wao.error.serviceCartography.importBoatDistrictKml= +wao.error.serviceChart.getContactPieChartData= +wao.error.serviceChart.getContactPieChartUrl= +wao.error.serviceContact.exportContactCsv= +wao.error.serviceContact.getContact= +wao.error.serviceContact.getContacts= +wao.error.serviceContact.getNbContacts= +wao.error.serviceContact.getNewContact= +wao.error.serviceContact.getPossibleObsDebCodes= +wao.error.serviceContact.getPossibleTerrestrialLocations= +wao.error.serviceContact.getPossibleValuesForFilter= +wao.error.serviceContact.getSubstitutesForBoat= +wao.error.serviceContact.importContactCsv= +wao.error.serviceContact.isBoatSampled= +wao.error.serviceContact.newContact= +wao.error.serviceContact.newContactFilter= +wao.error.serviceContact.saveComment= +wao.error.serviceContact.saveContact= +wao.error.serviceContact.sendContactDoneEmail= +wao.error.serviceContact.updateSampleMonthTidesValue= +wao.error.serviceContact.validateContact= +wao.error.serviceNews.getNewNews= +wao.error.serviceNews.getNews= +wao.error.serviceNews.newNews= +wao.error.serviceNews.saveNews= +wao.error.serviceReferential.getAllContactStateMotifs= +wao.error.serviceReferential.getAllFishingGearDCFs= +wao.error.serviceReferential.getAllObsDebCodes= +wao.error.serviceReferential.getAllObservationUnits= +wao.error.serviceReferential.getAllPorts= +wao.error.serviceReferential.getAllPortsAndAuctions= +wao.error.serviceReferential.getAllRegionIfremers= +wao.error.serviceReferential.getAllTargetSpeciesDCFs= +wao.error.serviceReferential.getAllTerrestrialDistricts= +wao.error.serviceReferential.getAllTerrestrialLocations= +wao.error.serviceReferential.getCodesDCF5Contains= +wao.error.serviceReferential.getFacades= +wao.error.serviceReferential.getFishingZones= +wao.error.serviceReferential.getProfessions= +wao.error.serviceReferential.getReferentialMeta= +wao.error.serviceReferential.getReferentialStates= +wao.error.serviceReferential.getSectors= +wao.error.serviceReferential.getTerrestrialDistrict= +wao.error.serviceReferential.importContactStateMotifs= +wao.error.serviceReferential.importContactStateMotives= +wao.error.serviceReferential.importDCFcodes= +wao.error.serviceReferential.importFishingZoneCsv= +wao.error.serviceReferential.importInitialContactStateMotifs= +wao.error.serviceReferential.importObsDebCodes= +wao.error.serviceReferential.importTerrestrialDivisions= +wao.error.serviceReferential.importTerrestrialLocations= +wao.error.serviceReferential.initialImport= +wao.error.serviceReferential.updateAllContactStatesMotifs= +wao.error.serviceReferential.updateReferentialMeta= +wao.error.serviceSampling.countSampleRows= +wao.error.serviceSampling.createSampleRowLog= +wao.error.serviceSampling.createUpdateSampleRow= +wao.error.serviceSampling.deleteSampleRow= +wao.error.serviceSampling.exportSamplingPlanCsv= +wao.error.serviceSampling.exportSamplingPlanICalendar= +wao.error.serviceSampling.getDCFGears= +wao.error.serviceSampling.getDCFSpecies= +wao.error.serviceSampling.getNewProfession= +wao.error.serviceSampling.getNewSampleMonth= +wao.error.serviceSampling.getNewSampleRow= +wao.error.serviceSampling.getNewSampleRowCode= +wao.error.serviceSampling.getNewSampleRowLog= +wao.error.serviceSampling.getObservationTimesInDays= +wao.error.serviceSampling.getPossibleValuesForFilter= +wao.error.serviceSampling.getPrograms= +wao.error.serviceSampling.getSampleRow= +wao.error.serviceSampling.getSampleRowByCode= +wao.error.serviceSampling.getSampleRowsByFilter= +wao.error.serviceSampling.getSampleRowsForEligibility= +wao.error.serviceSampling.getSampleRowsOrderedByFishingZone= +wao.error.serviceSampling.importSamplingPlanCsv= +wao.error.serviceSampling.newOperation= +wao.error.serviceSampling.newSampleRow= +wao.error.serviceSampling.newSamplingFilter= +wao.error.serviceSampling.validateSampleRow= +wao.error.serviceSynthesis.getAllIndicatorLogs= +wao.error.serviceSynthesis.getBoardingBoats= +wao.error.serviceSynthesis.getBoatsCount= +wao.error.serviceSynthesis.getComplianceBoardingIndicator= +wao.error.serviceSynthesis.getContactDataInputDateReactivity= +wao.error.serviceSynthesis.getContactPieChartData= +wao.error.serviceSynthesis.getContactPieChartDataByBoatDistrict= +wao.error.serviceSynthesis.getContactStateMotifsPieChartDataByBoatDistrict= +wao.error.serviceSynthesis.getContactStateStatistics= +wao.error.serviceSynthesis.getDataReliability= +wao.error.serviceSynthesis.getDataSampling= +wao.error.serviceSynthesis.getDistinctBoatsCounts= +wao.error.serviceSynthesis.getGlobalSynthesisParameters=Unable to get data about global synthesis parameters +wao.error.serviceSynthesis.getGlobalSynthesisResult= +wao.error.serviceSynthesis.getNonComplianceBoardingIndicator= +wao.error.serviceSynthesis.getObservationHours= +wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Unable to update global synthesis parameters +wao.error.serviceUser.acceptCgu= +wao.error.serviceUser.addTokensToAllProfiles= +wao.error.serviceUser.connect= +wao.error.serviceUser.createDefaultAdmin= +wao.error.serviceUser.createUpdateCompany= +wao.error.serviceUser.createUpdateUser= +wao.error.serviceUser.deleteCompany= +wao.error.serviceUser.deleteUser= +wao.error.serviceUser.existLogin= +wao.error.serviceUser.forgetPassword= +wao.error.serviceUser.getCompanies= +wao.error.serviceUser.getCompany= +wao.error.serviceUser.getConnectedUserByToken= +wao.error.serviceUser.getNewUser= +wao.error.serviceUser.getObservers= +wao.error.serviceUser.getUserByToken= +wao.error.serviceUser.getUserRolesByLogin= +wao.error.serviceUser.getUsersByCompany= +wao.export.ical.desc=wtih %s +wao.export.ical.title=ObsDeb Observation +wao.import.contact.failure.boatMissing=You need to precise the plate number of the boat associated to the contact +wao.import.contact.failure.districtMissing=You need to precise the boat district +wao.import.contact.failure.locationTypeMissing=The type of the location must be filled +wao.import.contact.failure.sampleRowCodeMissing=The code of the sample row line is missing +wao.import.contact.failure.terrestrialLocationMissing=The code of the terrestrial location is missing +wao.import.contact.failure.wrongBoat=There is no boat with plate number '%s' +wao.import.contact.failure.wrongColor=The color '%s' is not a valid color. It must be composed of 6 characters without the hash (\#), see http\://en.wikipedia.org/wiki/Web_colors +wao.import.contact.failure.wrongContactStateMotifCode=The code '%s' is not a valid code +wao.import.contact.failure.wrongDistrict='%s' is not a valid boat district code +wao.import.contact.failure.wrongSampleRowCode=The is no sample row with code '%s' +wao.import.contact.failure.wrongTerrestrialLocation=There is no location of type '%s' with code '%s' +wao.import.failure.wrongLocationType='%s' is not a valid location type, allowed values are %s +wao.import.failure.wrongObsDebCode=There is no profession code having code '%s' +wao.import.failure.wrongUser=There is no user with login '%s' +wao.import.sampleRow.failure.fishingZoneMissing=You must precise at least one fishing zone +wao.import.sampleRow.failure.missingSampleRowCode=You must precise a code for the sample row +wao.import.sampleRow.failure.wrongFishingZone=There is no fishing zone with the code '%s' +wao.import.sampleRow.failure.wrongSampleRowCodeFormat=The sample row code '%s' is not compliant with the format "YYYY_PIIII" +wao.validation.sampleRow.conflictOnObserver=Observer %s cannot be associated to the line %s because he has to observer, on the same day, for row %s +wao.validation.sampleRow.observerNotInCompany=Observer %s doesn't work for company %s Copied: trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties (from rev 1676, trunk/wao-persistence/src/main/resources/i18n/wao-business_fr_FR.properties) =================================================================== --- trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties (rev 0) +++ trunk/wao-persistence/src/main/resources/i18n/wao-persistence_fr_FR.properties 2014-01-24 14:13:31 UTC (rev 1678) @@ -0,0 +1,326 @@ +ContactPieChartConstant.OTHER=Autres +ContactPieChartConstant.REALIZED=Réalisés +ContactPieChartConstant.REFUSED=Refusés +ContactState.CONTACT_DEFINITELY_REFUSED=Refus définitif +ContactState.CONTACT_REFUSED=Refus +ContactState.CONTACT_START=Contact pris +ContactState.OBSERVATION_CANCELLED=Annulée +ContactState.OBSERVATION_DONE=Observation réalisée +ContactState.OBSERVATION_EXPECTED=Observation programmée +ContactState.OBSERVATION_NOT_DONE=Non observé +DataReliability.CORRECTION_ASKED=Correction demandée +DataReliability.DOUBTFUL=Douteuse +DataReliability.NOT_PROVIDED=Non contrôlée +DataReliability.NOT_RELIABLE=Non exploitable +DataReliability.RELIABLE=Exploitable +DataReliability.UNKNOWN=Inconnue +GlobalIndicatorValue.BAD=Pénalité de niveau 1 +GlobalIndicatorValue.GOOD=Bonus de niveau 1 +GlobalIndicatorValue.NEUTRAL=Conforme au cahier des charges +GlobalIndicatorValue.VERY_BAD=Pénalité de niveau 2 +GlobalIndicatorValue.VERY_GOOD=Bonus de niveau 2 +LocationType.AUCTION=Criée +LocationType.DISTRICT=Quartier maritime +LocationType.PORT=Port +LocationType.REGION=Région Ifremer +ObsProgram.OBSDEB=ObsDeb +ObsProgram.OBSMER=ObsMer +ObsProgram.OBSVENTE=ObsVente +ObservationType.FIELD_WORK_OBSERVATION=Observation de terrain +ObservationType.FIELD_WORK_SURVEY=Enquête de terrain +ObservationType.PHONE_CALL=Enquête téléphonique +ObservedDataControl.ACCEPTED=Valide +ObservedDataControl.CORRECTION_ASKED=Correction demandée +SamplingStrategy.SIMULTANEOUS_ALL_SPECIES=Simultané \: Toutes espèces commerciales +SamplingStrategy.SIMULTANEOUS_G1_G2_SPECIES=Simultané \: espèces G1+G2 +SamplingStrategy.SIMULTANEOUS_G1_SPECIES=Simultané \: espèces G1 +SamplingStrategy.SPECIFIC_STOCK=Stock spécifique +SynthesisId.DISTINCT_BOATS_COUNTS=Nombres de navires distincts observés +SynthesisId.GRAPH_BOARDING=Taux d'embarquement sur un même navire conforme aux exigences +SynthesisId.GRAPH_SAMPLING=Taux de réalisation du plan d'échantillonage +SynthesisId.IND_ALLEGRO_REACTIVITY=Délais de transmission des données +SynthesisId.IND_COMPLIANCE_BOARDING=Respect du nombre d'observateurs embarqués +SynthesisId.IND_CONTACT_STATE=États des contacts +SynthesisId.IND_DATA_RELIABILITY=Qualité de la donnée +SynthesisId.OBSERVATION_HOUR=Heures d'observation dans la journée +UserRole.ADMIN=Administrateur +UserRole.COORDINATOR=Coordinateur +UserRole.GUEST=Invité +UserRole.OBSERVER=Observateur +UserRole.PROFESSIONAL=Professionnel +csv.import.error.missingMandatoryHeaders=Les champs obligatoires %s sont manquants +csv.import.error.unableToParseValue=Erreur lors de l'interprétation de la valeur '%s' (colonne '%s', ligne %s) +csv.import.error.unableToReadField=Impossible de lire la colonne '%s' à la ligne %s +csv.import.error.unableToReadLine=Impossible de lire la ligne %s +csv.import.error.unableToSetValue=Impossible d'enregistrer la valeur '%s' (entité '%s', ligne %s, column '%s') +csv.import.error.unrecognizedHeaders=Les champs %s ne sont pas reconnus. Les champs possibles sont %s. +csv.import.logComment=Modification depuis import +fr.ifremer.wao.entity.Boat=Navires +fr.ifremer.wao.entity.BoatGroup=Stratification des navires +fr.ifremer.wao.entity.ContactStateMotif=Motifs de refus +fr.ifremer.wao.entity.FishingGearDCF.=Non spécifié +fr.ifremer.wao.entity.FishingGearDCF.DRB=Dragues remorquées par bateau +fr.ifremer.wao.entity.FishingGearDCF.DRH=Dragues à main +fr.ifremer.wao.entity.FishingGearDCF.FAR=Pièges aériens +fr.ifremer.wao.entity.FishingGearDCF.FCN=Éperviers +fr.ifremer.wao.entity.FishingGearDCF.FG=Autres engins retombants (non-spécifiés) +fr.ifremer.wao.entity.FishingGearDCF.FIX=Pièges (non-spécifiés) +fr.ifremer.wao.entity.FishingGearDCF.FPN=Filets-pièges fixes non couverts +fr.ifremer.wao.entity.FishingGearDCF.FPO=Nasses (casiers) +fr.ifremer.wao.entity.FishingGearDCF.FSN=Filets à l'étalage (diables) +fr.ifremer.wao.entity.FishingGearDCF.FWR=Barrages, parcs, bordigues, etc. +fr.ifremer.wao.entity.FishingGearDCF.FYK=Verveux +fr.ifremer.wao.entity.FishingGearDCF.GEN=Filets maillants et filets emmélants (non spécifiés) +fr.ifremer.wao.entity.FishingGearDCF.GES=Tamis à civelles +fr.ifremer.wao.entity.FishingGearDCF.GN=Filets maillants (non spécifiés) +fr.ifremer.wao.entity.FishingGearDCF.GNC=Filets maillants encerclants +fr.ifremer.wao.entity.FishingGearDCF.GND=Filets maillants dérivants (filets dérivants) +fr.ifremer.wao.entity.FishingGearDCF.GNF=Filets maillants fixes (sur perches) +fr.ifremer.wao.entity.FishingGearDCF.GNS=Filets maillants calés (ancrés) +fr.ifremer.wao.entity.FishingGearDCF.GT=Trémailleurs +fr.ifremer.wao.entity.FishingGearDCF.GTN=Trémails et filets maillants combinés +fr.ifremer.wao.entity.FishingGearDCF.GTR=Trémails +fr.ifremer.wao.entity.FishingGearDCF.HAR=Harpons +fr.ifremer.wao.entity.FishingGearDCF.HMD=Dragues mécanisées +fr.ifremer.wao.entity.FishingGearDCF.HMP=Pompes +fr.ifremer.wao.entity.FishingGearDCF.HMX=Engins de récolte (non spécifiés) +fr.ifremer.wao.entity.FishingGearDCF.LA=Filets tournants sans coulisse (filet lamparo) +fr.ifremer.wao.entity.FishingGearDCF.LHM=Lignes à main et lignes avec cannes (mécanisées) +fr.ifremer.wao.entity.FishingGearDCF.LHP=Lignes à main et lignes à cannes (manœuvrées à la main) +fr.ifremer.wao.entity.FishingGearDCF.LL=Palangres (non spécifiées) +fr.ifremer.wao.entity.FishingGearDCF.LLD=Palangres dérivantes +fr.ifremer.wao.entity.FishingGearDCF.LLS=Palangres calées ou semi-flottantes +fr.ifremer.wao.entity.FishingGearDCF.LN=Filets soulevés (non spécifiés) +fr.ifremer.wao.entity.FishingGearDCF.LNB=Filets soulevés manœuvrées du bateau +fr.ifremer.wao.entity.FishingGearDCF.LNP=Filets soulevés portatifs +fr.ifremer.wao.entity.FishingGearDCF.LNS=Filets soulevés fixes manœuvrées du rivage +fr.ifremer.wao.entity.FishingGearDCF.LTL=lignes de traîne +fr.ifremer.wao.entity.FishingGearDCF.LX=Lignes et palangres +fr.ifremer.wao.entity.FishingGearDCF.MIS=Divers +fr.ifremer.wao.entity.FishingGearDCF.NK=Engins inconnus ou non spécifiés +fr.ifremer.wao.entity.FishingGearDCF.OT=Chaluts à panneaux (non spécifié) +fr.ifremer.wao.entity.FishingGearDCF.OTB=Chalut de fond à panneaux +fr.ifremer.wao.entity.FishingGearDCF.OTM=Chaluts pélagiques à panneaux +fr.ifremer.wao.entity.FishingGearDCF.OTT=Chaluts jumeaux à panneaux +fr.ifremer.wao.entity.FishingGearDCF.PS=Filets tournants avec coulisse (sennes coulissantes) +fr.ifremer.wao.entity.FishingGearDCF.PS1=Filets tournants, sennes coulissantes manœuvrées par un bateau +fr.ifremer.wao.entity.FishingGearDCF.PS2=Filets tournants, sennes coulissantes manœuvrées par deux bateaux +fr.ifremer.wao.entity.FishingGearDCF.PT=Chalut-bœufs (non spécifié) +fr.ifremer.wao.entity.FishingGearDCF.PTB=Chalut-bœufs de fond +fr.ifremer.wao.entity.FishingGearDCF.PTM=Chalut-bœufs pélagiques +fr.ifremer.wao.entity.FishingGearDCF.RG=Engins de pêche révréative +fr.ifremer.wao.entity.FishingGearDCF.SB=Sennes de plages +fr.ifremer.wao.entity.FishingGearDCF.SDN=Sennes danoises +fr.ifremer.wao.entity.FishingGearDCF.SPR=Sennes manœuvrées par deux bateaux +fr.ifremer.wao.entity.FishingGearDCF.SSC=Sennes écossaises +fr.ifremer.wao.entity.FishingGearDCF.SV=Sennes halées à bord +fr.ifremer.wao.entity.FishingGearDCF.SW=Sennes (non spécifiées) +fr.ifremer.wao.entity.FishingGearDCF.TB=Chalut de fond (non spécifié) +fr.ifremer.wao.entity.FishingGearDCF.TBB=Chaluts à perche +fr.ifremer.wao.entity.FishingGearDCF.TBN=Chalut à langoustines +fr.ifremer.wao.entity.FishingGearDCF.TBS=Chalut à crevettes +fr.ifremer.wao.entity.FishingGearDCF.TM=Chalut pélagique (non spécifié) +fr.ifremer.wao.entity.FishingGearDCF.TMS=Chalut pélagique à crevettes +fr.ifremer.wao.entity.FishingGearDCF.TX=Autre chalut (non spécifié) +fr.ifremer.wao.entity.FishingZone=Zones de pêche +fr.ifremer.wao.entity.ObsDebCode=Codes métiers ObsDeb +fr.ifremer.wao.entity.TargetSpeciesDCF.=Non spécifié +fr.ifremer.wao.entity.TargetSpeciesDCF.ALG=Algues +fr.ifremer.wao.entity.TargetSpeciesDCF.ANA=Espèces anadromes +fr.ifremer.wao.entity.TargetSpeciesDCF.CAT=Espèces catadromes +fr.ifremer.wao.entity.TargetSpeciesDCF.CRU=Crustacés +fr.ifremer.wao.entity.TargetSpeciesDCF.CRW=Langouste +fr.ifremer.wao.entity.TargetSpeciesDCF.CSJ=Coquilles Saint-Jacques +fr.ifremer.wao.entity.TargetSpeciesDCF.DEF=Espèces démersales +fr.ifremer.wao.entity.TargetSpeciesDCF.DWS=Espèces d'eaux profondes +fr.ifremer.wao.entity.TargetSpeciesDCF.FIF=Poissons +fr.ifremer.wao.entity.TargetSpeciesDCF.FIN=Poisson plats +fr.ifremer.wao.entity.TargetSpeciesDCF.LPF=Grands pélagiques +fr.ifremer.wao.entity.TargetSpeciesDCF.MOL=Mollusques +fr.ifremer.wao.entity.TargetSpeciesDCF.SPF=Petits pélagiques +fr.ifremer.wao.entity.TerrestrialDivision=Stratification géographique +fr.ifremer.wao.entity.TerrestrialLocation=Lieux terrestres +wao.business.boat.validation.immatriculation.wrongFormat=L'immatriculation du navire doit être formée de 6 chiffres +wao.business.contact.validation.commentAdminNecessaryForDataReliability=Il faut préciser dans le commentaire administrateur pourquoi la donnée est '%s' +wao.business.contact.validation.commentMissingForState=Il faut préciser un commentaire pour l'état '%s' +wao.business.contact.validation.contactStateMotifMissing=Il faut préciser un motif de refus +wao.business.contact.validation.contactStateMotifUnwanted=Il ne faut pas préciser de motif de refus +wao.business.contact.validation.dataReliabilityMissingForValidation=Il faut préciser la qualité de la donnée avant de valider +wao.business.contact.validation.missingHoursOfBeginEndObservation=Il faut préciser les heures exactes de début et de fin d'observation +wao.business.contact.validation.observedDataControlMissingForValidation=Il faut préciser une valeur pour le contrôle des données observées +wao.business.contact.validation.restitutionMissingForValidation=Il faut préciser une date de transmission de la restitution de la donnée avant de valider +wao.business.entity.UserProfile.description=%s sur %s%s +wao.business.mammalsCapture.mail.message=Bonjour,\n\nUn observateur du programme Obsmer a renseigné dans WAO l'information suivante \:\n\nMarée \: %s\nMétier \: %s\n\nCapture accidentelle \:\n%s\n\nCordialement,\n\nLe programme Obsmer\nhttp\://www.ifremer.fr/wao +wao.business.mammalsCapture.mail.subject=Obsmer WAO\: Information sur capture accidentelle +wao.business.other=Autre +wao.business.readOnly=(lecture seule) +wao.error.boat.canCreateContact=Impossible de créer un nouveau contact pour la société %1$s et le navire %2$s (%3$d) +wao.error.boat.getNbBoarding=Impossible de récupérer le nombre d'embarquements réels depuis le %1$s +wao.error.boatInfos.getNbBoardingForCompany=Impossible de récupérer le nombre d'embarquements réels depuis le %1$s pour la société %2$s +wao.error.context.close=Une erreur est survenue pendant la fermeture du contexte principale de ToPIA +wao.error.context.encodeString= +wao.error.context.getRootContext=Une erreur est survenue pour la récupération du contexte principale de ToPIA +wao.error.context.parse=Une erreur est survenue pendant le chargement de la configuration du fichier %1$s +wao.error.context.rollback=Une erreur est survenue pendant l'annulation de la transaction courante +wao.error.context.start=Une erreur est survenue pendant le démarrage de l'application +wao.error.context.stop=Une erreur est survenue pendant la fermeture de l'application +wao.error.sampleMonth.addRealTideTime=Impossible d'enregistrer le nombre de marées réels pour le mois de %1$s [ligne \: %2$s] +wao.error.sampleRow.saveSampleRowLog=Impossible d'enregistrer le commentaire écrit par %1$s +wao.error.serviceBoat.createUpdateCompanyBoatInfos=Impossible de créer ou modifier les informations liés au navire %1$d pour la société %2$s +wao.error.serviceBoat.exportBoatCsv=Impossible d'exporter les navires sélectionnés +wao.error.serviceBoat.getActivityCalendarLogAccessFile= +wao.error.serviceBoat.getActivityCalendarLogFile= +wao.error.serviceBoat.getAllActiveBoats= +wao.error.serviceBoat.getBoat=Impossible de charger le navire +wao.error.serviceBoat.getBoatNamesStartWith=Impossible de récupérer les navires avec un nom commencant par '%1$s' +wao.error.serviceBoat.getBoatsByFilter=Impossible de filtrer la liste des navires +wao.error.serviceBoat.getBoatsByImmatriculations=La chaîne d'immatriculations est incorrect \! Chaque immatriculation doit posséder 6 chiffres +wao.error.serviceBoat.getCompanyBoatInfos=Impossible de récupérer les informations du navire immatriculé %1$d pour la société %2$s +wao.error.serviceBoat.getLastActivityCalendar=Impossible de charger le dernier calendrier d'activité du navire %1$s (%2$d) +wao.error.serviceBoat.getNbBoatsByFilter=Impossible de filtrer la liste des navires +wao.error.serviceBoat.getPossibleValuesForFilter= +wao.error.serviceBoat.getShipOwnerNamesContains= +wao.error.serviceBoat.importActivityCalendarCsv=Problème d'import du fichier CSV des calendriers d'activité +wao.error.serviceBoat.importBoatCsv=Problème d'import du fichier CSV. Vérifiez l'en-tête du fichier. +wao.error.serviceBoat.importBoatGroups= +wao.error.serviceBoat.newBoatFilter= +wao.error.serviceCartography.exportContactMotifsStatisticsKml= +wao.error.serviceCartography.exportContactStatisticsBySeaboardKml= +wao.error.serviceCartography.exportContactStatisticsKml= +wao.error.serviceCartography.importBoatDistrictKml=Impossible d'importer les coordonnées des quartiers des navires. Vérifiez la documentation pour le bon format du fichier Kml. +wao.error.serviceChart.getContactPieChartData= +wao.error.serviceChart.getContactPieChartUrl= +wao.error.serviceContact.exportContactCsv=Impossible d'exporter les contacts +wao.error.serviceContact.getContact=Impossible de trouver le contact +wao.error.serviceContact.getContacts=Impossible de filtrer la liste des contacts +wao.error.serviceContact.getNbContacts=Impossible de compter le nombre de contacts filtrés +wao.error.serviceContact.getNewContact=Impossible d'instancier un nouveau contact +wao.error.serviceContact.getPossibleObsDebCodes= +wao.error.serviceContact.getPossibleTerrestrialLocations= +wao.error.serviceContact.getPossibleValuesForFilter= +wao.error.serviceContact.getSubstitutesForBoat= +wao.error.serviceContact.importContactCsv=Impossible d'importer les contacts +wao.error.serviceContact.isBoatSampled= +wao.error.serviceContact.newContact= +wao.error.serviceContact.newContactFilter= +wao.error.serviceContact.saveComment= +wao.error.serviceContact.saveContact=Impossible de sauvegarder le contact +wao.error.serviceContact.sendContactDoneEmail= +wao.error.serviceContact.updateSampleMonthTidesValue= +wao.error.serviceContact.validateContact= +wao.error.serviceNews.getNewNews= +wao.error.serviceNews.getNews=Impossible de récupérer l'ensemble des news +wao.error.serviceNews.newNews= +wao.error.serviceNews.saveNews=Impossible d'enregistrer la news ayant pour titre '%1$s' +wao.error.serviceReferential.getAllContactStateMotifs= +wao.error.serviceReferential.getAllFishingGearDCFs= +wao.error.serviceReferential.getAllObsDebCodes= +wao.error.serviceReferential.getAllObservationUnits= +wao.error.serviceReferential.getAllPorts= +wao.error.serviceReferential.getAllPortsAndAuctions= +wao.error.serviceReferential.getAllRegionIfremers= +wao.error.serviceReferential.getAllTargetSpeciesDCFs= +wao.error.serviceReferential.getAllTerrestrialDistricts= +wao.error.serviceReferential.getAllTerrestrialLocations= +wao.error.serviceReferential.getCodesDCF5Contains= +wao.error.serviceReferential.getFacades=Impossible de charger la liste des facades +wao.error.serviceReferential.getFishingZones=Impossible de charger la liste des secteurs de pêche +wao.error.serviceReferential.getProfessions=Impossible de charger la liste des métiers +wao.error.serviceReferential.getReferentialMeta= +wao.error.serviceReferential.getReferentialStates= +wao.error.serviceReferential.getSectors=Impossible de charger la liste des zones de pêche +wao.error.serviceReferential.getTerrestrialDistrict= +wao.error.serviceReferential.importContactStateMotifs= +wao.error.serviceReferential.importContactStateMotives= +wao.error.serviceReferential.importDCFcodes=Impossible de créer le référentiel des codes DCF +wao.error.serviceReferential.importFishingZoneCsv=Problème d'import du fichier CSV. Vérifiez l'en-tête du fichier \: [ PECHE_DIVISION,PECHE_ZONE,PECHE_FACADE ]. Voir documentation pour plus de détails. +wao.error.serviceReferential.importInitialContactStateMotifs= +wao.error.serviceReferential.importObsDebCodes= +wao.error.serviceReferential.importTerrestrialDivisions= +wao.error.serviceReferential.importTerrestrialLocations= +wao.error.serviceReferential.initialImport= +wao.error.serviceReferential.updateAllContactStatesMotifs= +wao.error.serviceReferential.updateReferentialMeta= +wao.error.serviceSampling.countSampleRows= +wao.error.serviceSampling.createSampleRowLog= +wao.error.serviceSampling.createUpdateSampleRow=Impossible de sauvegarder la ligne d'échantillon +wao.error.serviceSampling.deleteSampleRow=Impossible de supprimer la ligne d'échantillon \: %1$s +wao.error.serviceSampling.exportSamplingPlanCsv=Impossible d'exporter le plan d'échantillonnage sur la période du %1$s au %2$s +wao.error.serviceSampling.exportSamplingPlanICalendar= +wao.error.serviceSampling.getDCFGears= +wao.error.serviceSampling.getDCFSpecies= +wao.error.serviceSampling.getNewProfession= +wao.error.serviceSampling.getNewSampleMonth= +wao.error.serviceSampling.getNewSampleRow= +wao.error.serviceSampling.getNewSampleRowCode=Impossible de récupérer un nouveau code pour une ligne d'échantillonnage +wao.error.serviceSampling.getNewSampleRowLog= +wao.error.serviceSampling.getObservationTimesInDays= +wao.error.serviceSampling.getPossibleValuesForFilter= +wao.error.serviceSampling.getPrograms=Impossible de charger la liste des programmes +wao.error.serviceSampling.getSampleRow=Impossible de charger la ligne d'échantillon ayant pour identifiant \: %1$s +wao.error.serviceSampling.getSampleRowByCode=Impossible de charger la ligne d'échantillon ayant pour code %1$s +wao.error.serviceSampling.getSampleRowsByFilter=Impossible de récupérer la liste des lignes du plan d'échantillonnage +wao.error.serviceSampling.getSampleRowsForEligibility= +wao.error.serviceSampling.getSampleRowsOrderedByFishingZone=Impossible de récupérer la liste des lignes du plan d'échantillonnage +wao.error.serviceSampling.importSamplingPlanCsv=Erreur lors de l'import du plan +wao.error.serviceSampling.newOperation= +wao.error.serviceSampling.newSampleRow= +wao.error.serviceSampling.newSamplingFilter= +wao.error.serviceSampling.validateSampleRow= +wao.error.serviceSynthesis.getAllIndicatorLogs= +wao.error.serviceSynthesis.getBoardingBoats=Impossible de récupérer les données du graphique concernant les embarquements sur les navires +wao.error.serviceSynthesis.getBoatsCount= +wao.error.serviceSynthesis.getComplianceBoardingIndicator= +wao.error.serviceSynthesis.getContactDataInputDateReactivity=Impossible de récupérer l'indicateur de réactivité sur les dates de saisies dans Allegro +wao.error.serviceSynthesis.getContactPieChartData= +wao.error.serviceSynthesis.getContactPieChartDataByBoatDistrict= +wao.error.serviceSynthesis.getContactStateMotifsPieChartDataByBoatDistrict= +wao.error.serviceSynthesis.getContactStateStatistics=Impossible de récupérer les statistiques sur les états des contacts +wao.error.serviceSynthesis.getDataReliability= +wao.error.serviceSynthesis.getDataSampling=Impossible de récupérer les données pour le graphique dynamique des efforts de marées +wao.error.serviceSynthesis.getDistinctBoatsCounts= +wao.error.serviceSynthesis.getGlobalSynthesisParameters=Impossible de récupérer les données concernant les indicateurs pour la synthèse globale +wao.error.serviceSynthesis.getGlobalSynthesisResult= +wao.error.serviceSynthesis.getNonComplianceBoardingIndicator=Impossible de récupérer l'indicateur de non respect du nombre d'observateurs embarqués +wao.error.serviceSynthesis.getObservationHours= +wao.error.serviceSynthesis.updateGlobalSynthesisParameters=Impossible de mettre à jour les paramètres de la synthèse globale +wao.error.serviceUser.acceptCgu= +wao.error.serviceUser.addTokensToAllProfiles= +wao.error.serviceUser.connect=Une erreur est survenue lors de la demande de connexion +wao.error.serviceUser.createDefaultAdmin=Impossible de créer l'administrateur par défaut +wao.error.serviceUser.createUpdateCompany=Impossible de créer ou de mettre à jour la société +wao.error.serviceUser.createUpdateUser=Impossible de créer ou de mettre à jour l'utilisateur +wao.error.serviceUser.deleteCompany=Impossible de supprimer la société ou de vérifier les contraintes de suppression +wao.error.serviceUser.deleteUser=Impossible de supprimer l'utilisateur +wao.error.serviceUser.existLogin= +wao.error.serviceUser.forgetPassword=Impossible d'envoyer le mail d'oubli de mot de passe +wao.error.serviceUser.getCompanies=Impossible de récupérer la liste des sociétés +wao.error.serviceUser.getCompany= +wao.error.serviceUser.getConnectedUserByToken= +wao.error.serviceUser.getNewUser=Impossible d'instancier un nouvel utilisateur +wao.error.serviceUser.getObservers=Impossible de récupérer la liste des observateurs +wao.error.serviceUser.getUserByToken= +wao.error.serviceUser.getUserRolesByLogin= +wao.error.serviceUser.getUsersByCompany=Impossible de récupérer la liste des utilisateurs de la société %1$s +wao.export.ical.desc=avec %s +wao.export.ical.title=Observation ObsDeb +wao.import.contact.failure.boatMissing=Il faut préciser l'immatriculation du navire associé au contact +wao.import.contact.failure.districtMissing=Il faut préciser le code d'un quartier maritime +wao.import.contact.failure.locationTypeMissing=Le type du lieu doit être renseigné +wao.import.contact.failure.sampleRowCodeMissing=Il manque le code de la ligne de plan associée +wao.import.contact.failure.terrestrialLocationMissing=Il manque le code du lieu +wao.import.contact.failure.wrongBoat=Il n'y a pas de navire avec l'immatriculation '%s' +wao.import.contact.failure.wrongColor=Le code couleur '%s' n'est pas valide, il doit être composé de six caractères sans dièze voir http\://fr.wikipedia.org/wiki/Couleurs_du_Web +wao.import.contact.failure.wrongContactStateMotifCode=Le code '%s' n'est pas un code de motif de refus valide +wao.import.contact.failure.wrongDistrict='%s' n'est pas un code quartier maritime valide +wao.import.contact.failure.wrongSampleRowCode=Il n'y a pas de ligne du plan avec le code '%s' +wao.import.contact.failure.wrongTerrestrialLocation=Il n'y a pas de lieu de type '%s' ayant pour code '%s' +wao.import.failure.wrongLocationType='%s' n'est pas un type de lieu valide, les valeurs admises sont %s +wao.import.failure.wrongObsDebCode=Il n'y a pas de code métier ayant pour code '%s' +wao.import.failure.wrongUser=Il n'y a pas d'utilisateur ayant pour identifiant '%s' +wao.import.sampleRow.failure.fishingZoneMissing=Il faut préciser au moins une zone de pêche +wao.import.sampleRow.failure.missingSampleRowCode=Il faut préciser un code pour a ligne du plan +wao.import.sampleRow.failure.wrongFishingZone=Le code '%s' ne correspond à aucune zone de pêche connue du référentiel +wao.import.sampleRow.failure.wrongSampleRowCodeFormat=Le code '%s' n'est pas un code de ligne valide selon le format "AAAA_PIIII" +wao.validation.sampleRow.conflictOnObserver=L'observateur %s ne peut être associé à la ligne %s car il doit observer, le même jour, pour la ligne %s +wao.validation.sampleRow.observerNotInCompany=L'observateur %s ne fait pas parti de la société %s

1 0

r1677 - in trunk: . wao-services wao-services/src wao-services/src/main wao-services/src/main/java wao-services/src/main/java/fr wao-services/src/main/java/fr/ifremer wao-services/src/main/java/fr/ifremer/wao wao-services/src/main/java/fr/ifremer/wao/services wao-services/src/main/java/fr/ifremer/wao/services/service wao-services/src/test wao-services/src/test/java wao-services/src/test/java/fr wao-services/src/test/java/fr/ifremer wao-services/src/test/java/fr/ifremer/wao wao-services/src/tes
by bleny＠users.forge.codelutin.com 24 Jan '14

24 Jan '14

Author: bleny Date: 2014-01-24 11:41:09 +0100 (Fri, 24 Jan 2014) New Revision: 1677 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1677 Log: introduce wao-services module Added: trunk/wao-services/ trunk/wao-services/LICENSE.txt trunk/wao-services/README.txt trunk/wao-services/pom.xml trunk/wao-services/src/ trunk/wao-services/src/main/ trunk/wao-services/src/main/java/ trunk/wao-services/src/main/java/fr/ trunk/wao-services/src/main/java/fr/ifremer/ trunk/wao-services/src/main/java/fr/ifremer/wao/ trunk/wao-services/src/main/java/fr/ifremer/wao/services/ trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoWebApplicationContext.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InitWaoService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java trunk/wao-services/src/main/resources/ trunk/wao-services/src/test/ trunk/wao-services/src/test/java/ trunk/wao-services/src/test/java/fr/ trunk/wao-services/src/test/java/fr/ifremer/ trunk/wao-services/src/test/java/fr/ifremer/wao/ trunk/wao-services/src/test/java/fr/ifremer/wao/services/ trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/InitWaoServiceTest.java trunk/wao-services/src/test/resources/ Property changes on: trunk/wao-services ___________________________________________________________________ Added: svn:ignore + *.iml .idea .settings target .project Copied: trunk/wao-services/LICENSE.txt (from rev 1675, tags/wao-3.4.1/wao-business/LICENSE.txt) =================================================================== --- trunk/wao-services/LICENSE.txt (rev 0) +++ trunk/wao-services/LICENSE.txt 2014-01-24 10:41:09 UTC (rev 1677) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + 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 Affero 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/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: trunk/wao-services/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:mergeinfo + /branches/wao-1.5.x/wao-business/LICENSE.txt:679-733 Copied: trunk/wao-services/README.txt (from rev 1675, tags/wao-3.4.1/wao-business/README.txt) =================================================================== --- trunk/wao-services/README.txt (rev 0) +++ trunk/wao-services/README.txt 2014-01-24 10:41:09 UTC (rev 1677) @@ -0,0 +1 @@ +Look at README.txt in Wao-ui to launch the application Property changes on: trunk/wao-services/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:mergeinfo + /branches/wao-1.5.x/wao-business/README.txt:679-733 Added: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml (rev 0) +++ trunk/wao-services/pom.xml 2014-01-24 10:41:09 UTC (rev 1677) @@ -0,0 +1,146 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>fr.ifremer</groupId> + <artifactId>wao</artifactId> + <version>4.0-SNAPSHOT</version> + </parent> + + <artifactId>wao-services</artifactId> + + <name>Wao :: Services</name> + <description>Wao services module</description> + + <dependencies> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-csv</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>com.github.spullara.mustache.java</groupId> + <artifactId>compiler</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + </dependency> + + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>wao-persistence</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + </dependency> + +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <id>parseOthersAndGen</id> + <configuration> + <entries> + <entry> + <specificGoal>parserValidation</specificGoal> + <basedir>${maven.src.dir}/main/java/</basedir> + <includes> + <param>**/**-validation.xml</param> + </includes> + </entry> + </entries> + </configuration> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> Property changes on: trunk/wao-services/pom.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/DefaultWaoServiceContext.java 2014-01-24 10:41:09 UTC (rev 1677) @@ -0,0 +1,98 @@ +package fr.ifremer.wao.services; + +import fr.ifremer.wao.WaoApplicationConfig; +import fr.ifremer.wao.WaoTechnicalException; +import fr.ifremer.wao.WaoTopiaPersistenceContext; + +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.Date; +import java.util.Random; + +public class DefaultWaoServiceContext implements WaoServiceContext { + + protected WaoApplicationConfig applicationConfig; + + protected WaoTopiaPersistenceContext persistenceContext; + + protected WaoWebApplicationContext webApplicationContext; + + protected Random random; + + @Override + public WaoApplicationConfig getApplicationConfig() { + return applicationConfig; + } + + public void setPersistenceContext(WaoTopiaPersistenceContext persistenceContext) { + this.persistenceContext = persistenceContext; + } + + @Override + public WaoTopiaPersistenceContext getPersistenceContext() { + return persistenceContext; + } + + public void setApplicationConfig(WaoApplicationConfig applicationConfig) { + this.applicationConfig = applicationConfig; + } + + @Override + public <E extends WaoService> E newService(Class<E> serviceClass) { + + E service; + + try { + + Constructor<E> constructor = serviceClass.getConstructor(); + + service = constructor.newInstance(); + + } catch (NoSuchMethodException e) { + + throw new WaoTechnicalException("all services must provide a non-argument constructor", e); + + } catch (InvocationTargetException 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); + + return service; + + } + + @Override + public Random getRandom() { + if (random == null) { + random = new Random(); + } + return random; + } + + @Override + public Date getNow() { + Date now = new Date(); + return now; + } + + @Override + public WaoWebApplicationContext getWebApplicationContext() { + return webApplicationContext; + } + + public void setWebApplicationContext(WaoWebApplicationContext webApplicationContext) { + this.webApplicationContext = webApplicationContext; + } + +} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoService.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoService.java 2014-01-24 10:41:09 UTC (rev 1677) @@ -0,0 +1,10 @@ +package fr.ifremer.wao.services; + +/** + * @author bleny + */ +public interface WaoService { + + void setServiceContext(WaoServiceContext serviceContext); + +} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoServiceContext.java 2014-01-24 10:41:09 UTC (rev 1677) @@ -0,0 +1,26 @@ +package fr.ifremer.wao.services; + +import fr.ifremer.wao.WaoApplicationConfig; +import fr.ifremer.wao.WaoTopiaPersistenceContext; + +import java.util.Date; +import java.util.Random; + +/** + * @author bleny + */ +public interface WaoServiceContext { + + WaoApplicationConfig getApplicationConfig(); + + WaoTopiaPersistenceContext getPersistenceContext(); + + Date getNow(); + + <E extends WaoService> E newService(Class<E> serviceClass); + + WaoWebApplicationContext getWebApplicationContext(); + + Random getRandom(); + +} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoWebApplicationContext.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoWebApplicationContext.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/WaoWebApplicationContext.java 2014-01-24 10:41:09 UTC (rev 1677) @@ -0,0 +1,41 @@ +package fr.ifremer.wao.services; + +/* + * #%L + * Extranet ENC-AHI :: Services + * $Id: ExtranetEncAhiWebApplicationContext.java 827 2013-12-04 15:30:35Z bleny $ + * $HeadURL: http://svn.forge.codelutin.com/svn/extranet-enc-ahi/trunk/extranet-services… $ + * %% + * Copyright (C) 2013 Ministère des Affaires sociales et de la Santé + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +/** + * Make a service aware of way to generate URL to point to a + * precise page of the web interface. + * + * @author bleny + */ +public interface WaoWebApplicationContext { + +// String getAdministrationUrl(ExtranetUser extranetUser); +// +// String getYearlyDeclarationResumeURL(YearlyDeclaration yearlyDeclaration); +// +// String getYearlyDeclarationsUrl(); + +} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InitWaoService.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InitWaoService.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/InitWaoService.java 2014-01-24 10:41:09 UTC (rev 1677) @@ -0,0 +1,9 @@ +package fr.ifremer.wao.services.service; + +public class InitWaoService extends WaoServiceSupport { + + public void init() { + + } + +} Added: 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 (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/SamplingPlanService.java 2014-01-24 10:41:09 UTC (rev 1677) @@ -0,0 +1,5 @@ +package fr.ifremer.wao.services.service; + +public class SamplingPlanService extends WaoServiceSupport { + +} Added: trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java =================================================================== --- trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java (rev 0) +++ trunk/wao-services/src/main/java/fr/ifremer/wao/services/service/WaoServiceSupport.java 2014-01-24 10:41:09 UTC (rev 1677) @@ -0,0 +1,45 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.WaoApplicationConfig; +import fr.ifremer.wao.WaoTopiaPersistenceContext; +import fr.ifremer.wao.services.WaoService; +import fr.ifremer.wao.services.WaoServiceContext; +import fr.ifremer.wao.services.WaoWebApplicationContext; +import fr.ifremer.wao.services.service.SamplingPlanService; + +import java.util.Date; + +public abstract class WaoServiceSupport implements WaoService { + + protected WaoServiceContext serviceContext; + + @Override + public void setServiceContext(WaoServiceContext serviceContext) { + this.serviceContext = serviceContext; + } + + protected WaoApplicationConfig getApplicationConfig() { + return serviceContext.getApplicationConfig(); + } + + protected Date getNow() { + return serviceContext.getNow(); + } + + protected WaoTopiaPersistenceContext getPersistenceContext() { + return serviceContext.getPersistenceContext(); + } + + public WaoWebApplicationContext getWebApplicationContext() { + return serviceContext.getWebApplicationContext(); + } + + public <E extends WaoService> E newService(Class<E> serviceClass) { + return serviceContext.newService(serviceClass); + } + + protected SamplingPlanService getSamplingPlanService() { + return newService(SamplingPlanService.class); + } + +} Added: trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java (rev 0) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/AbstractWaoServiceTest.java 2014-01-24 10:41:09 UTC (rev 1677) @@ -0,0 +1,253 @@ +package fr.ifremer.wao.services; + +import fr.ifremer.wao.WaoApplicationConfig; +import fr.ifremer.wao.WaoTechnicalException; +import fr.ifremer.wao.WaoTopiaApplicationContext; +import fr.ifremer.wao.WaoTopiaPersistenceContext; +import fr.ifremer.wao.services.service.InitWaoService; +import org.apache.commons.lang3.SystemUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.hibernate.cfg.Environment; +import org.junit.After; +import org.nuiton.util.FileUtil; + +import java.io.File; +import java.io.IOException; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +public class AbstractWaoServiceTest { + + private static final Log log = LogFactory.getLog(AbstractWaoServiceTest.class); + + protected static final double DELTA = 0.0001; + + protected static final String DATABASE_REF = "DataBaseRef"; + + protected static WaoApplicationConfig applicationConfig; + + protected FakeWaoServiceContext serviceContext; + + protected WaoTopiaApplicationContext applicationContext; + + protected List<WaoTopiaPersistenceContext> openedTransactions = new LinkedList<WaoTopiaPersistenceContext>(); + + protected WaoTopiaApplicationContext newApplicationContext(String dataBase) { + + Map<String, String> hibernateH2Config = new HashMap<String, String>(); + + hibernateH2Config.putAll(getApplicationConfig().getTopiaProperties()); + + hibernateH2Config.put(Environment.DRIVER, org.h2.Driver.class.getName()); + hibernateH2Config.put(Environment.USER, "sa"); + hibernateH2Config.put(Environment.PASS, ""); + + File tempDirFile = SystemUtils.getJavaIoTmpDir(); + + File databaseFile = new File(tempDirFile, dataBase); + + String h2dataPath = databaseFile.getAbsolutePath() + File.separator + "h2data"; + + String jdbcUrl = "jdbc:h2:file:" + h2dataPath; + + hibernateH2Config.put(Environment.URL, jdbcUrl); + + if (log.isTraceEnabled()) { + log.trace("will store H2 data in " + h2dataPath); + log.trace("allJpaParameters = " + hibernateH2Config); + } + + if (log.isDebugEnabled()) { + log.debug("jdbc url is\n" + jdbcUrl); + } + + WaoTopiaApplicationContext applicationContext = new WaoTopiaApplicationContext(hibernateH2Config); + + if (log.isTraceEnabled()) { + log.trace("created root context " + applicationContext); + } + + return applicationContext; + } + + protected boolean isDatabaseWithReferential() { + return false; + } + + protected WaoTopiaApplicationContext getApplicationContext () { + + String databaseName = UUID.randomUUID().toString(); + + if (isDatabaseWithReferential()) { + + File tempDirFile = SystemUtils.getJavaIoTmpDir(); + + File databaseRefFile = new File(tempDirFile, DATABASE_REF); + + if (!databaseRefFile.exists()) { + + if (log.isTraceEnabled()) { + log.trace("create referential data base"); + } + + WaoTopiaApplicationContext applicationContext = newApplicationContext(DATABASE_REF); + + WaoTopiaPersistenceContext persistenceContext; + + persistenceContext = applicationContext.newPersistenceContext(); + + if (log.isTraceEnabled()) { + log.trace("opened transaction " + persistenceContext); + } + + FakeWaoServiceContext serviceContext = new FakeWaoServiceContext(); + + serviceContext.setApplicationConfig(getApplicationConfig()); + + serviceContext.setPersistenceContext(persistenceContext); + + InitWaoService initWaoService = serviceContext.newService(InitWaoService.class); + + initWaoService.init(); + + if (log.isTraceEnabled()) { + log.trace("closing transaction " + persistenceContext); + } + + persistenceContext.closeContext(); + + if (log.isTraceEnabled()) { + log.trace("closing transaction " + applicationContext); + } + + applicationContext.closeContext(); + + File lockFile = new File(databaseRefFile, "h2data.lock.db"); + + int countWaiting = 0; + + while (lockFile.exists() && countWaiting < 25) { + try { + Thread.sleep(200); + } catch (InterruptedException e) { + throw new WaoTechnicalException("can't wait", e); + } + countWaiting++; + } + + if (lockFile.exists()) { + throw new WaoTechnicalException("database ref is not close after 5 seconds !"); + } + + } + + File databaseFile = new File(tempDirFile, databaseName); + + if (log.isTraceEnabled()) { + log.trace("Copy referential database to " + databaseFile.getName()); + } + + try { + FileUtil.copyAndRenameRecursively(databaseRefFile, databaseFile, false, null, null, false); + } catch (IOException e) { + throw new WaoTechnicalException("can't copy database Ref", e); + } + + if (log.isTraceEnabled()) { + log.trace("Copy referential database : Complete"); + } + } + + return newApplicationContext(databaseName); + } + + protected WaoTopiaPersistenceContext newPersistenceContext() { + + if (applicationContext == null) { + + applicationContext = getApplicationContext(); + + } + + WaoTopiaPersistenceContext persistenceContext; + + persistenceContext = applicationContext.newPersistenceContext(); + + if (log.isTraceEnabled()) { + log.trace("opened transaction " + persistenceContext); + } + + openedTransactions.add(persistenceContext); + + return persistenceContext; + + } + + @After + public void tearDown() { + + for (WaoTopiaPersistenceContext openedTransaction : openedTransactions) { + + if (log.isTraceEnabled()) { + log.trace("closing transaction " + openedTransaction); + } + + openedTransaction.closeContext(); + + } + + if (applicationContext != null) { + + if (log.isTraceEnabled()) { + log.trace("closing transaction " + applicationContext); + } + + applicationContext.closeContext(); + + } + + } + + protected static WaoApplicationConfig getApplicationConfig() { + + if (applicationConfig == null) { + + applicationConfig = new WaoApplicationConfig(); + + } + + return applicationConfig; + + } + + protected FakeWaoServiceContext getServiceContext() { + + if (serviceContext == null) { + + FakeWaoServiceContext serviceContext = new FakeWaoServiceContext(); + + serviceContext.setApplicationConfig(getApplicationConfig()); + + WaoTopiaPersistenceContext persistenceContext = newPersistenceContext(); + + serviceContext.setPersistenceContext(persistenceContext); + + this.serviceContext = serviceContext; + + } + + return serviceContext; + + } + + protected <E extends WaoService> E newService(Class<E> serviceClass) { + + return getServiceContext().newService(serviceClass); + + } + +} Added: trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java (rev 0) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/FakeWaoServiceContext.java 2014-01-24 10:41:09 UTC (rev 1677) @@ -0,0 +1,36 @@ +package fr.ifremer.wao.services; + +import com.google.common.base.Preconditions; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.Date; +import java.util.Random; + +public class FakeWaoServiceContext extends DefaultWaoServiceContext { + + private static final Log log = LogFactory.getLog(FakeWaoServiceContext.class); + + protected Date date; + + @Override + public Random getRandom() { + if (random == null) { + random = new Random(540727613); + } + return random; + } + + @Override + public Date getNow() { + Preconditions.checkState(date != null, "you must provide a date before running service test"); + if (log.isTraceEnabled()) { + log.trace("injecting fake date in service: " + date); + } + return date; + } + + public void setDate(Date date) { + this.date = date; + } +} Added: trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/InitWaoServiceTest.java =================================================================== --- trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/InitWaoServiceTest.java (rev 0) +++ trunk/wao-services/src/test/java/fr/ifremer/wao/services/service/InitWaoServiceTest.java 2014-01-24 10:41:09 UTC (rev 1677) @@ -0,0 +1,20 @@ +package fr.ifremer.wao.services.service; + +import fr.ifremer.wao.services.AbstractWaoServiceTest; +import org.junit.Before; +import org.junit.Test; + +public class InitWaoServiceTest extends AbstractWaoServiceTest { + + protected InitWaoService service; + + @Before + public void setUp() { + service = newService(InitWaoService.class); + } + + @Test + public void testInit() { + + } +}

1 0

Jump to page: