June 2015 - Echobase-commits - mailman.cloud.codelutin.com

branch release/2.9 deleted (was cd70185)
by codelutin.com scm 19 Jun '15

19 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch release/2.9 in repository echobase. See http://git.codelutin.com/echobase.git was cd70185 [jgitflow-maven-plugin]updating poms for branch'release/2.9' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag echobase-2.9 created (now b180070)
by codelutin.com scm 19 Jun '15

19 Jun '15

This is an automated email from the git hooks/post-receive script. New change to annotated tag echobase-2.9 in repository echobase. See http://git.codelutin.com/echobase.git at b180070 (tag) tagging df07e0f5a045b39a359ef33fab08c61ef9b1845a (commit) replaces echobase-2.8 tagged by Maven Release on Fri Jun 19 15:29:46 2015 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 2.9 ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch release/2.9 updated (361df3f -> cd70185)
by codelutin.com scm 19 Jun '15

19 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch release/2.9 in repository echobase. See http://git.codelutin.com/echobase.git from 361df3f revert lizmap template adds cd70185 [jgitflow-maven-plugin]updating poms for branch'release/2.9' with non-snapshot versions No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (23d0828 -> 77dbfdf)
by codelutin.com scm 19 Jun '15

19 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 23d0828 [jgitflow-maven-plugin]updating poms for 2.10-SNAPSHOT development new b2900b7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new cd70185 [jgitflow-maven-plugin]updating poms for branch'release/2.9' with non-snapshot versions new df07e0f [jgitflow-maven-plugin]merging 'release/2.9' into 'master' new 33d8b84 [jgitflow-maven-plugin]merging 'master' into 'develop' new 77dbfdf [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 77dbfdfc5e6211422690d598bedab5758602695c Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Jun 19 15:29:49 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 33d8b84711c74e72640f2f6d54a7d8931971fe6b Merge: b2900b7 df07e0f Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Jun 19 15:29:48 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' commit b2900b748fcf42d71619263e41649a40532fec5e Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Jun 19 15:29:48 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit df07e0f5a045b39a359ef33fab08c61ef9b1845a Merge: 0e157a3 cd70185 Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Jun 19 15:29:45 2015 +0000 [jgitflow-maven-plugin]merging 'release/2.9' into 'master' commit cd7018574a501dbce38b850ea1b7dff8d05911ca Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Jun 19 15:27:13 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/2.9' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch master updated (0e157a3 -> df07e0f)
by codelutin.com scm 19 Jun '15

19 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch master in repository echobase. See http://git.codelutin.com/echobase.git from 0e157a3 Merge branch 'release/2.8' adds 2933074 [jgitflow-maven-plugin]updating poms for 2.9-SNAPSHOT development adds 8cf050e [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 415e650 Merge branch 'master' into develop adds cdde5a7 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 514f408 utilisation d'une classe helper pour chaque entite adds 0a55d61 mis en place filtrage des indicateurs a exporter par voyage adds 2a33130 utilisation des nouveau helper d'entities adds bee7476 pas de calcul de zone au depart adds 6309fb7 amelioration code adds 7bd2f31 correction javascript adds 41a5a73 fix api adds b81ab5b fixes #6513 adds f40ac25 fixes #6512: Enlever la notification de rafraichissement de données spatiales suite à un import adds 4a3e6ca ajout du parametre ux11 pour genere les cartes adds be369f2 fixes #6509 adds f0bfb8a fixes #6053: On peut importer plusieurs fois les mêmes résultats voyage pour un même voyage adds 515be56 fixes #6507: Impossible de voir la page des données spatiales adds 4ccdc8e fixes #6510: Revoir la position des layers dans la carto adds 8d5ba41 improve pg jdbc url adds b6a0ab8 up codelutinpom to 2.3 (refs #7227) adds d133ecc fixes #7227: Up codelutinpom to 2.3 Merge branch 'feature/7227' into develop adds 730c718 utilisation coser 1.5.6 (refs #7240) adds af6bdba fixes #7240: Mise à jour de coser en 1.5.6 Merge branch 'feature/7240' into develop adds 9de6a12 refs #6511 : correction du fichier de template lizmap adds f2b62a9 refs #6511 : mise à jour de la documentation d'installation de lizmap adds b00e1e3 refs #6511 : configuration de l'avant-guichet Apache adds 1efe3a6 refs #6511 : correction de la documentation d'installation adds 05dfbcb add qgis mapserver version in pom (refs #6511) adds f64c2d6 update docs (refs #6511) adds c17bd2c update default option value (refs #6511) adds 605581a change doc url in gis jsp (refs #6511) adds 5895fd4 fix doc (refs #6511) adds d13b360 refs #6511 : correction du dépot pour Qgis server. adds 77237b6 refs #6511 : Qgis : adaptation du dépot en fonction du système adds 9a15ecc make some javadoc jdk1.8 aware adds 86b2667 fixes #6511: Il manque quelques informations dans la doc d'installation de la partie spatiale Merge branch 'feature/6511' into develop adds cd2be91 From scmwebeditor -- Correction de typo sur la documentation adds c4c12a0 ajout entrée dns dans la doc d'installation (refs #6511) adds 361df3f revert lizmap template adds cd70185 [jgitflow-maven-plugin]updating poms for branch'release/2.9' with non-snapshot versions adds df07e0f [jgitflow-maven-plugin]merging 'release/2.9' into 'master' No new revisions were added by this update. Summary of changes: echobase-domain/pom.xml | 2 +- .../fr/ifremer/echobase/EchoBaseDateConverter.java | 2 +- .../fr/ifremer/echobase/EchoBaseFunctions.java | 371 ------------------ .../fr/ifremer/echobase/EchoBasePredicates.java | 190 ---------- .../echobase/EchoBaseTechnicalException.java | 2 +- .../main/java/fr/ifremer/echobase/I18nAble.java | 2 +- .../config/EchoBaseApplicationConfigProvider.java | 2 +- .../echobase/config/EchoBaseConfiguration.java | 2 +- .../config/EchoBaseConfigurationOption.java | 10 +- .../ifremer/echobase/converter/FloatConverter.java | 6 +- .../fr/ifremer/echobase/csv/ChainValueParser.java | 2 +- .../fr/ifremer/echobase/csv/EchoBaseCsvUtil.java | 2 +- .../fr/ifremer/echobase/csv/ResultValueParser.java | 2 +- .../echobase/entities/AbstractEchoBaseDao.java | 2 +- .../fr/ifremer/echobase/entities/DriverType.java | 2 +- .../EchoBaseInternalPersistenceContext.java | 2 +- .../entities/EchoBaseUserPersistenceContext.java | 2 +- .../ifremer/echobase/entities/ExportQueries.java | 2 +- .../fr/ifremer/echobase/entities/ImportLogs.java | 35 +- .../fr/ifremer/echobase/entities/ImportType.java | 2 +- .../fr/ifremer/echobase/entities/data/Cells.java | 89 +++++ .../echobase/entities/data/DataProcessings.java | 31 +- .../echobase/entities/data/EchotypeTopiaDao.java | 2 +- .../Species2.java => data/Echotypes.java} | 48 +-- .../ifremer/echobase/entities/data/Operations.java | 68 ++++ .../fr/ifremer/echobase/entities/data/Results.java | 31 +- .../ifremer/echobase/entities/data/Transects.java | 32 +- .../ifremer/echobase/entities/data/VoyageImpl.java | 10 +- .../fr/ifremer/echobase/entities/data/Voyages.java | 31 +- .../{Species2.java => AcousticInstruments.java} | 39 +- .../entities/references/AgeCategories.java | 31 +- .../entities/references/AreaOfOperations.java | 31 +- .../echobase/entities/references/CellMethods.java | 31 +- .../echobase/entities/references/CellTypes.java | 101 +++++ .../entities/references/DataMetadatas.java | 31 +- .../entities/references/DataQualities.java | 36 +- .../echobase/entities/references/DataTypes.java | 31 +- .../entities/references/DepthStratums.java | 31 +- .../entities/references/EchotypeCategories.java | 31 +- .../entities/references/GearMetadatas.java | 31 +- .../echobase/entities/references/Gears.java | 34 +- .../echobase/entities/references/Missions.java | 31 +- .../entities/references/OperationEvents.java | 31 +- .../entities/references/OperationMetadatas.java | 31 +- .../entities/references/ReferenceDatumTypes.java | 31 +- .../entities/references/ReferenceDatums.java | 31 +- .../{Species2.java => SampleDataTypes.java} | 40 +- .../entities/references/SexCategories.java | 31 +- .../{Species2.java => SizeCategories.java} | 38 +- .../echobase/entities/references/Species2.java | 8 + .../{Species2.java => SpeciesCategories.java} | 42 +- .../echobase/entities/references/Stratas.java | 31 +- .../echobase/entities/references/VesselTypes.java | 31 +- .../echobase/entities/references/Vessels.java | 31 +- .../entities/spatial/SpatialConfiguration.java | 2 +- .../fr/ifremer/echobase/io/CommandLineUtils.java | 2 +- .../fr/ifremer/echobase/io/EchoBaseIOUtil.java | 2 +- .../java/fr/ifremer/echobase/io/InputFile.java | 2 +- .../echobase/persistence/EchoBaseDbMeta.java | 2 +- .../echobase/persistence/EchoBaseEntityHelper.java | 6 +- .../persistence/EchoBasePersistenceHelper.java | 2 +- .../EchobaseTopiaApplicationContexts.java | 4 +- .../EchoBaseMigrationCallBackResolver.java | 2 +- .../internalDb/MigrationCallBackForVersion.java | 2 +- .../internalDb/MigrationCallBackForVersion2_2.java | 2 +- .../migration/internalDb/MigrationCallback.java | 2 +- .../workingDb/MigrationCallBackForVersion.java | 2 +- .../workingDb/MigrationCallBackForVersion2_2.java | 2 +- .../MigrationCallBackForVersion2_5_1.java | 2 +- .../workingDb/MigrationCallBackForVersion2_6.java | 2 +- .../MigrationCallBackForVersion2_6_1.java | 2 +- .../migration/workingDb/MigrationCallback.java | 2 +- .../echobase/EchoBaseDateConverterTest.java | 2 +- .../echobase/persistence/EchoBaseDbMetaTest.java | 2 +- echobase-services/pom.xml | 2 +- .../AbstractEchobaseActionConfiguration.java | 4 +- .../services/DefaultEchoBaseServiceContext.java | 2 +- .../ifremer/echobase/services/EchoBaseService.java | 2 +- .../echobase/services/EchoBaseServiceContext.java | 2 +- .../ifremer/echobase/services/EchobaseAieOC.java | 4 +- .../ifremer/echobase/services/ProgressModel.java | 2 +- .../echobase/services/ServiceEchobaseAieOC.java | 2 +- .../echobase/services/service/CoserApiService.java | 4 +- .../echobase/services/service/CoserIndicators.java | 53 +++ .../echobase/services/service/DbEditorService.java | 2 +- .../services/service/DecoratorService.java | 2 +- .../services/service/UserDbPersistenceService.java | 95 ++++- .../EmbeddedApplicationConfiguration.java | 2 +- .../EmbeddedApplicationService.java | 2 +- .../exportCoser/ExportCoserConfiguration.java | 2 +- .../service/exportCoser/ExportCoserService.java | 2 +- .../service/exportCoser/IndicatorExportModel.java | 2 +- .../service/exportCoser/IndicatorExportRow.java | 2 +- .../exportCoser/RawDataCatchExportModel.java | 2 +- .../service/exportCoser/RawDataCatchExportRow.java | 2 +- .../exportCoser/RawDataSizeExportModel.java | 2 +- .../service/exportCoser/RawDataSizeExportRow.java | 2 +- .../exportCoser/RawDataStrataExportModel.java | 2 +- .../exportCoser/RawDataStrataExportRow.java | 2 +- .../service/exportCoser/SpeciesExportModel.java | 2 +- .../service/exportCoser/SpeciesExportRow.java | 2 +- .../service/exportdb/ExportDbConfiguration.java | 2 +- .../services/service/exportdb/ExportDbMode.java | 2 +- .../services/service/exportdb/ExportDbService.java | 4 +- .../services/service/exportdb/ExportService.java | 2 +- .../service/exportquery/ExportQueryCsvModel.java | 2 +- .../ExportQueryInvalidNameException.java | 2 +- .../ExportQueryNameAlreadyExistException.java | 2 +- .../exportquery/ExportQueryNotFoundException.java | 2 +- .../service/exportquery/ExportQueryService.java | 2 +- .../service/exportquery/GenericSQLQuery.java | 4 +- .../importdata/AbstractImportConfiguration.java | 4 +- .../importdata/AbstractImportDataService.java | 2 +- .../importdata/AcousticImportConfiguration.java | 2 +- .../service/importdata/AcousticImportResult.java | 2 +- .../service/importdata/AcousticImportService.java | 15 +- .../importdata/CatchesImportConfiguration.java | 2 +- .../service/importdata/CatchesImportService.java | 23 +- .../service/importdata/CellPositionReference.java | 2 +- .../service/importdata/CommonAllImportService.java | 6 +- .../importdata/CommonImportConfiguration.java | 2 +- .../service/importdata/CommonImportService.java | 2 +- .../importdata/CommonTransectImportService.java | 9 +- .../importdata/CommonTransitImportService.java | 6 +- .../importdata/CommonVoyageImportService.java | 2 +- .../importdata/EchoBaseCsvFileImportResult.java | 2 +- .../service/importdata/ImportException.java | 2 +- .../MissionNameAlreadyExistException.java | 2 +- .../importdata/OperationImportConfiguration.java | 2 +- .../service/importdata/OperationImportService.java | 21 +- .../importdata/ResultsEsduCellImportService.java | 27 +- .../importdata/ResultsImportConfiguration.java | 2 +- .../service/importdata/ResultsImportService.java | 2 +- .../ResultsMapFishCellImportService.java | 21 +- .../ResultsMapOtherCellImportService.java | 12 +- .../importdata/ResultsRegionCellImportService.java | 33 +- ... ResultsVoyageImportAlreadyExistException.java} | 18 +- .../importdata/ResultsVoyageImportService.java | 68 ++-- .../importdata/csv/AcousticImportModel.java | 2 +- .../service/importdata/csv/AcousticImportRow.java | 2 +- .../importdata/csv/BiometrySampleImportModel.java | 2 +- .../importdata/csv/BiometrySampleImportRow.java | 2 +- .../importdata/csv/EchotypeImportModel.java | 2 +- .../service/importdata/csv/EchotypeImportRow.java | 2 +- ...ultByEchotypeAndSpeciesCategoryImportModel.java | 2 +- ...esultByEchotypeAndSpeciesCategoryImportRow.java | 2 +- .../csv/EsduResultByEchotypeImportModel.java | 2 +- .../csv/EsduResultByEchotypeImportRow.java | 2 +- ...duResultBySpeciesAndAgeCategoryImportModel.java | 2 +- ...EsduResultBySpeciesAndAgeCategoryImportRow.java | 2 +- ...uResultBySpeciesAndSizeCategoryImportModel.java | 2 +- ...sduResultBySpeciesAndSizeCategoryImportRow.java | 2 +- .../csv/GearMetadataValueImportModel.java | 2 +- .../importdata/csv/GearMetadataValueImportRow.java | 2 +- .../importdata/csv/LengthAgeKeyImportModel.java | 2 +- .../importdata/csv/LengthAgeKeyImportRow.java | 2 +- .../importdata/csv/LengthWeightKeyImportModel.java | 2 +- .../importdata/csv/LengthWeightKeyImportRow.java | 2 +- .../service/importdata/csv/MapCellImportModel.java | 2 +- .../service/importdata/csv/MapCellImportRow.java | 2 +- .../importdata/csv/OperationImportModel.java | 2 +- .../service/importdata/csv/OperationImportRow.java | 2 +- .../csv/OperationMetadataValueImportModel.java | 2 +- .../csv/OperationMetadataValueImportRow.java | 2 +- .../csv/RegionCellAssociationImportModel.java | 2 +- .../csv/RegionCellAssociationImportRow.java | 2 +- .../importdata/csv/RegionCellImportModel.java | 2 +- .../importdata/csv/RegionCellImportRow.java | 2 +- .../csv/RegionCellResultImportModel.java | 2 +- .../importdata/csv/RegionCellResultImportRow.java | 2 +- .../importdata/csv/SubSampleImportModel.java | 2 +- .../service/importdata/csv/SubSampleImportRow.java | 2 +- .../importdata/csv/TotalSampleImportModel.java | 2 +- .../importdata/csv/TotalSampleImportRow.java | 2 +- .../importdata/csv/TransectImportModel.java | 2 +- .../service/importdata/csv/TransectImportRow.java | 2 +- .../service/importdata/csv/TransitImportModel.java | 2 +- .../service/importdata/csv/TransitImportRow.java | 2 +- .../service/importdata/csv/VoyageImportModel.java | 2 +- .../importdb/EchoBaseImportModelFactory.java | 2 +- .../service/importdb/ImportDbConfiguration.java | 2 +- .../services/service/importdb/ImportDbMode.java | 2 +- .../services/service/importdb/ImportDbService.java | 2 +- .../services/service/importdb/ImportService.java | 2 +- .../strategy/AbstractImportDbStrategy.java | 2 +- .../importdb/strategy/EchoBaseImportStrategy.java | 2 +- .../importdb/strategy/FreeImportDbStrategy.java | 2 +- .../strategy/ReferentialImportDbStrategy.java | 2 +- .../removedata/RemoveDataConfiguration.java | 2 +- .../service/removedata/RemoveDataService.java | 2 +- .../strategy/AbstractRemoveDataStrategy.java | 2 +- .../strategy/AcousticRemoveDataStrategy.java | 4 +- .../strategy/CatchesRemoveDataStrategy.java | 4 +- .../strategy/CommonAllRemoveDataStrategy.java | 4 +- .../strategy/CommonTransectRemoveDataStrategy.java | 4 +- .../strategy/CommonTransitRemoveDataStrategy.java | 4 +- .../strategy/CommonVoyageRemoveDataStrategy.java | 4 +- .../strategy/LegacyVoyageRemoveDataStrategy.java | 4 +- .../strategy/OperationRemoveDataStrategy.java | 4 +- .../strategy/ResultEsduRemoveDataStrategy.java | 4 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 4 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 4 +- .../strategy/ResultRegionRemoveDataStrategy.java | 4 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 4 +- .../services/service/spatial/GisService.java | 16 +- .../services/service/spatial/LizmapRepository.java | 24 +- .../services/service/spatial/PgJdbcUrl.java | 64 ++++ .../service/spatial/SpatialDataService.java | 2 +- ...orkingDbConfigurationAlreadyExistException.java | 2 +- .../WorkingDbConfigurationNotFoundException.java | 2 +- .../workingDb/WorkingDbConfigurationService.java | 4 +- .../gis/templates/EchoBaseLizmapTemplate.qgs.cfg | 421 +++++++++++---------- .../gis/templates/EchoBaseQGisTemplate.qgs | 303 ++++++++------- .../i18n/echobase-services_en_GB.properties | 1 + .../i18n/echobase-services_fr_FR.properties | 1 + .../src/main/resources/rscript/extractMap.r | 3 +- .../echobase/services/EchoBaseServiceFixtures.java | 2 +- .../services/EchoBaseTestServiceSupport.java | 2 +- .../services/FakeEchoBaseServiceContext.java | 2 +- .../fr/ifremer/echobase/services/FixCellsIT.java | 4 +- .../services/service/CoserApiServiceTest.java | 2 +- .../services/service/DecoratorServiceTest.java | 2 +- .../EmbeddedApplicationServiceIT.java | 2 +- .../exportCoser/ExportCoserServiceTest.java | 2 +- .../service/exportdb/ExportDbServiceTest.java | 2 +- .../exportquery/ExportQueryServiceTest.java | 2 +- .../importdata/AbstractImportDataServiceIT.java | 6 +- .../importdata/AcousticImportServiceIT.java | 2 +- .../service/importdata/CatchesImportServiceIT.java | 2 +- .../importdata/CommonAllImportServiceIT.java | 2 +- .../importdata/CommonTransectImportServiceIT.java | 2 +- .../importdata/CommonTransitImportServiceIT.java | 2 +- .../importdata/CommonVoyageImportServiceIT.java | 2 +- .../importdata/OperationImportServiceIT.java | 2 +- .../importdata/ResultsEsduCellImportServiceIT.java | 2 +- .../ResultsMapFishCellImportServiceIT.java | 2 +- .../ResultsMapOtherCellImportServiceIT.java | 2 +- .../ResultsRegionCellImportServiceIT.java | 2 +- .../importdata/ResultsVoyageImportServiceIT.java | 2 +- .../service/importdb/ImportDbServiceTest.java | 2 +- .../service/spatial/LizmapRepositoryTest.java | 68 ++++ .../services/service/spatial/PgJdbcUrlTest.java | 73 ++++ .../removedata/AbstractRemoveDataServiceTest.java | 2 +- .../removedata/AcousticRemoveDataServiceTest.java | 2 +- .../removedata/CatchesRemoveDataServiceTest.java | 2 +- .../removedata/CommonAllRemoveDataServiceTest.java | 2 +- .../CommonTransectRemoveDataServiceTest.java | 2 +- .../CommonTransitRemoveDataServiceTest.java | 2 +- .../CommonVoyageRemoveDataServiceTest.java | 2 +- .../removedata/OperationRemoveDataServiceTest.java | 2 +- .../ResultEsduRemoveDataServiceTest.java | 2 +- .../ResultMapRemoveFishDataServiceTest.java | 2 +- .../ResultMapRemoveOtherDataServiceTest.java | 2 +- .../ResultRegionRemoveDataServiceTest.java | 2 +- .../ResultVoyageRemoveDataServiceTest.java | 2 +- echobase-ui/pom.xml | 2 +- .../echobase/ui/EchoBaseApplicationContext.java | 2 +- .../echobase/ui/EchoBaseApplicationListener.java | 6 +- .../ui/EchoBaseInternalDbTransactionFilter.java | 2 +- .../fr/ifremer/echobase/ui/EchoBaseSession.java | 10 +- .../echobase/ui/EchoBaseSessionListener.java | 2 +- .../echobase/ui/EchoBaseStaticContentLoader.java | 4 +- .../ui/EchoBaseUserDbTransactionFilter.java | 4 +- .../ui/actions/AbstractConfigureAction.java | 2 +- .../ui/actions/AbstractJSONPaginedAction.java | 2 +- .../ui/actions/AbstractWaitAndExecAction.java | 2 +- .../echobase/ui/actions/EchoBaseActionSupport.java | 2 +- .../java/fr/ifremer/echobase/ui/actions/Home.java | 2 +- .../ui/actions/dbeditor/AbstractLoadPage.java | 2 +- .../echobase/ui/actions/dbeditor/GetEntities.java | 6 +- .../ui/actions/dbeditor/GetForeignEntities.java | 2 +- .../echobase/ui/actions/dbeditor/ImportTable.java | 2 +- .../echobase/ui/actions/dbeditor/LoadEntities.java | 2 +- .../echobase/ui/actions/dbeditor/SaveEntity.java | 6 +- .../ui/actions/embeddedApplication/Build.java | 2 +- .../ui/actions/embeddedApplication/Configure.java | 2 +- .../ui/actions/embeddedApplication/Download.java | 2 +- .../echobase/ui/actions/exportCoser/Configure.java | 47 +-- .../echobase/ui/actions/exportCoser/Download.java | 2 +- .../echobase/ui/actions/exportCoser/Export.java | 2 +- .../GetAvailableIndicatorsForMission.java | 99 +++++ .../echobase/ui/actions/exportCoser/GetZones.java | 2 +- .../echobase/ui/actions/exportDb/Configure.java | 2 +- .../echobase/ui/actions/exportDb/Download.java | 2 +- .../echobase/ui/actions/exportDb/Export.java | 2 +- .../exportQuery/AbstractEditExportQuery.java | 4 +- .../ui/actions/exportQuery/CloneExportQuery.java | 4 +- .../exportQuery/ConfirmDeleteExportQuery.java | 4 +- .../actions/exportQuery/CreateNewExportQuery.java | 2 +- .../ui/actions/exportQuery/DeleteExportQuery.java | 4 +- .../exportQuery/DownloadExportQueryResult.java | 2 +- .../ui/actions/exportQuery/EditExportQuery.java | 2 +- .../ui/actions/exportQuery/ExportQueryResult.java | 2 +- .../actions/exportQuery/GetExportQueryResult.java | 2 +- .../actions/exportQuery/NewLibreOfficeQuery.java | 2 +- .../ui/actions/exportQuery/SaveExportQuery.java | 4 +- .../ui/actions/exportQuery/ShowExportQuery.java | 2 +- .../importData/AbstractConfigureImport.java | 2 +- .../actions/importData/AbstractLaunchImport.java | 5 +- .../importData/ConfigureAcousticImport.java | 2 +- .../actions/importData/ConfigureCatchesImport.java | 2 +- .../actions/importData/ConfigureCommonImport.java | 2 +- .../importData/ConfigureOperationImport.java | 2 +- .../actions/importData/ConfigureResultsImport.java | 2 +- .../ui/actions/importData/CreateMission.java | 2 +- .../importData/GetDataProcessingsForVoyage.java | 2 +- .../ui/actions/importData/GetVesselsForVoyage.java | 2 +- .../echobase/ui/actions/importData/ImportMode.java | 2 +- .../actions/importData/LaunchAcousticImport.java | 2 +- .../ui/actions/importData/LaunchCatchesImport.java | 2 +- .../ui/actions/importData/LaunchCommonImport.java | 2 +- .../actions/importData/LaunchOperationImport.java | 2 +- .../ui/actions/importData/LaunchResultsImport.java | 2 +- .../ui/actions/importData/SelectImportType.java | 2 +- .../echobase/ui/actions/importDb/Configure.java | 2 +- .../echobase/ui/actions/importDb/Import.java | 2 +- .../ui/actions/removeData/ConfirmDelete.java | 2 +- .../echobase/ui/actions/removeData/Delete.java | 6 +- .../echobase/ui/actions/removeData/ImportLogs.java | 2 +- .../ui/actions/spatial/ComputeSpatialData.java | 2 +- .../ifremer/echobase/ui/actions/spatial/Show.java | 2 +- .../ifremer/echobase/ui/actions/user/Create.java | 2 +- .../ifremer/echobase/ui/actions/user/Delete.java | 2 +- .../fr/ifremer/echobase/ui/actions/user/Login.java | 2 +- .../ifremer/echobase/ui/actions/user/Logout.java | 2 +- .../ifremer/echobase/ui/actions/user/Update.java | 2 +- .../actions/workingDb/AbstractWorkingDbAction.java | 2 +- .../echobase/ui/actions/workingDb/AddSpatial.java | 4 +- .../echobase/ui/actions/workingDb/Connect.java | 2 +- .../echobase/ui/actions/workingDb/Create.java | 2 +- .../ui/actions/workingDb/CreatePostgresDb.java | 4 +- .../echobase/ui/actions/workingDb/DashBoard.java | 2 +- .../echobase/ui/actions/workingDb/Delete.java | 2 +- .../echobase/ui/actions/workingDb/Disconnect.java | 2 +- .../ui/actions/workingDb/DownloadDriver.java | 2 +- .../ui/actions/workingDb/GetImportLogDetail.java | 2 +- .../echobase/ui/actions/workingDb/GetVoyage.java | 2 +- .../echobase/ui/actions/workingDb/Information.java | 2 +- .../echobase/ui/actions/workingDb/ShowList.java | 2 +- .../ui/interceptors/AbstractCheckInterceptor.java | 2 +- .../ui/interceptors/CheckLogguedInterceptor.java | 2 +- .../echobase/ui/interceptors/CheckUserIsAdmin.java | 2 +- .../ui/interceptors/CheckWorkingDbSelected.java | 2 +- .../validators/EchoBaseFieldValidatorSupport.java | 4 +- .../echobase/ui/validators/LoginValidator.java | 2 +- .../main/resources/config/struts-exportCoser.xml | 6 + .../resources/i18n/echobase-ui_en_GB.properties | 1 - .../resources/i18n/echobase-ui_fr_FR.properties | 1 - .../webapp/WEB-INF/jsp/exportCoser/configure.jsp | 7 + .../src/main/webapp/WEB-INF/jsp/spatial/show.jsp | 2 +- echobase-ui/src/main/webapp/js/gridHelper.js | 68 +++- pom.xml | 9 +- src/site/rst/configure.rst.vm | 81 ++++ src/site/rst/install.rst.vm | 262 +++++++------ src/site/rst/update.rst.vm | 59 +++ src/site/site_en.xml | 2 + src/site/site_fr.xml | 2 + 357 files changed, 2382 insertions(+), 2123 deletions(-) delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseFunctions.java delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/EchoBasePredicates.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogs.java (55%) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Cells.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/DataProcessings.java (63%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/{references/Species2.java => data/Echotypes.java} (50%) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Operations.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Results.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Transects.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Voyages.java (63%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/{Species2.java => AcousticInstruments.java} (55%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AgeCategories.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/AreaOfOperations.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellMethods.java (63%) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/CellTypes.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataMetadatas.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataQualities.java (53%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DataTypes.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/DepthStratums.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/EchotypeCategories.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/GearMetadatas.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Gears.java (56%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Missions.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/OperationEvents.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/OperationMetadatas.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/ReferenceDatumTypes.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/ReferenceDatums.java (63%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/{Species2.java => SampleDataTypes.java} (53%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/SexCategories.java (63%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/{Species2.java => SizeCategories.java} (55%) copy echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/{Species2.java => SpeciesCategories.java} (52%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Stratas.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/VesselTypes.java (63%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/exportCoser/GenerateCoserMapException.java => echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/Vessels.java (63%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/CoserIndicators.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{MissionNameAlreadyExistException.java => ResultsVoyageImportAlreadyExistException.java} (72%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/spatial/PgJdbcUrl.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/LizmapRepositoryTest.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/spatial/PgJdbcUrlTest.java create mode 100644 echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportCoser/GetAvailableIndicatorsForMission.java create mode 100644 src/site/rst/configure.rst.vm create mode 100644 src/site/rst/update.rst.vm -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[ANN] - EchoBase 2.9 released
by codelutin.com Release Notification 19 Jun '15

19 Jun '15

The EchoBase team is pleased to announce the echobase-2.9 release! The French Institute for the Exploitation of the Sea (Ifremer) has designed an open software suite for storing fisheries acoustic data and computing acoustic indicators for survey-based ecosystem monitoring. It comprises a postgreSQL database designed to store acoustic, navigation and fishing data from ecosystemic surveys (EchoBase) and a suite of R codes (EchoR) for computing fish population indicators based on Echobase data. Documentation of the project can be found here: https://echobase.codelutin.com Changes ------- Changes in this version include: New features: o Revoir la position des layers dans la carto Issue: 6510. Thanks to Tony Chemit. Resolved by tchemit. o Enlever la notification de rafraichissement de données spatiales suite à un import Issue: 6512. Thanks to Tony Chemit. Resolved by tchemit. o Il manque quelques informations dans la doc d'installation de la partie spatiale Issue: 6511. Thanks to Tony Chemit. Resolved by sbavencoff. o Export coser, filtrer les indicateurs possibles Issue: 6513. Thanks to Tony Chemit. Resolved by mdoray. o Ajouter nouveau paramètre ux11 dans le script R Issue: 6514. Thanks to Tony Chemit. Resolved by tchemit. o Up codelutinpom to 2.3 Issue: 7227. Thanks to Tony Chemit. Resolved by tchemit. o Mise à jour de coser en 1.5.6 Issue: 7240. Thanks to Tony Chemit. Resolved by tchemit. o On peut importer plusieurs fois les mêmes résultats voyage pour un même voyage Issue: 6053. Thanks to Mathieu Doray. Resolved by tchemit. Fixed Bugs: o Impossible de générer les carte pour l'export Coser Issue: 6509. Thanks to Tony Chemit. Resolved by tchemit. o Impossible de voir la page des données spatiales Issue: 6507. Thanks to Tony Chemit. Resolved by tchemit. o Impossible de visualiser les cartes si en https Issue: 6273. Thanks to Tony Chemit. Resolved by tchemit. o Impossible de faire un export de certains indicateurs (on a des valeurs NA). Issue: 6478. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/echobase/files * echobase-embedded-2.9.zip - http://forge.codelutin.com/attachments/download/3283 * echobase-referentiel-2.9.echobase - http://forge.codelutin.com/attachments/download/3284 * echobase-ui-2.9-full.war - http://forge.codelutin.com/attachments/download/3285 * echobase-ui-2.9-lizmap.zip - http://forge.codelutin.com/attachments/download/3286 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -EchoBase team

1 0

branch release/2.9 created (now 361df3f)
by codelutin.com scm 19 Jun '15

19 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch release/2.9 in repository echobase. See http://git.codelutin.com/echobase.git at 361df3f revert lizmap template No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (361df3f -> 23d0828)
by codelutin.com scm 19 Jun '15

19 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 361df3f revert lizmap template new 23d0828 [jgitflow-maven-plugin]updating poms for 2.10-SNAPSHOT development The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 23d08283557ba3e821ba1916579f87d63de5095a Author: Maven Release <maven-release(a)codelutin.com> Date: Fri Jun 19 15:24:05 2015 +0000 [jgitflow-maven-plugin]updating poms for 2.10-SNAPSHOT development Summary of changes: echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (c4c12a0 -> 361df3f)
by codelutin.com scm 19 Jun '15

19 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from c4c12a0 ajout entrée dns dans la doc d'installation (refs #6511) new 361df3f revert lizmap template The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 361df3f11822ece02752ba58da9016e9958b14ef Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Jun 19 16:27:55 2015 +0200 revert lizmap template Summary of changes: .../gis/templates/EchoBaseLizmapTemplate.qgs.cfg | 169 ++++++++++++--------- 1 file changed, 95 insertions(+), 74 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (cd2be91 -> c4c12a0)
by codelutin.com scm 19 Jun '15

19 Jun '15

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from cd2be91 From scmwebeditor -- Correction de typo sur la documentation new c4c12a0 ajout entrée dns dans la doc d'installation (refs #6511) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c4c12a0001ec1c3c7d10e1517c04e2e28af919d9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Jun 19 16:03:56 2015 +0200 ajout entrée dns dans la doc d'installation (refs #6511) Summary of changes: src/site/rst/install.rst.vm | 5 +++++ 1 file changed, 5 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1