[Coser-commits] branch master updated (f23718c -> 951c21b)

This is an automated email from the git hooks/post-receive script. New change to branch master in repository coser. See https://gitlab.nuiton.org/codelutin/coser.git from f23718c [jgitflow-maven-plugin]merging 'release/1.5.6' into 'master' adds 12f2e29 [jgitflow-maven-plugin]updating poms for 1.5.7-SNAPSHOT development adds 3543ce3 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds cb059c6 [jgitflow-maven-plugin]merging 'master' into 'develop' adds 2a288cf [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds a48594f Up to version 1.6-SNAPSHOT adds 2711dba Passage sous gitlab + mise à jour de la configuration des sites adds efe351b fixes #8028: Evolution du logo du ministère adds 7b242bf Happy new year adds 5b6bf71 Update parent adds 03060e8 Struts security update adds 763893c Fix build adds 47b56c9 Fix tests without x env adds 6a33618 Remove fix tests without x env adds 8d82e40 Update freemarker for struts adds d6af0af Revert lib update (not working at all) adds 0bdcf97 Change release version adds ad86166 Happy new year commit adds ae2d49c fixes #9058: ERROR fr.ifremer.coser.web.CoserApplicationListener:83 - Zone with no picture: solper adds 67c02e9 Remove myself from copyright adds f7fd0e2 [jgitflow-maven-plugin]updating poms for 1.5.7 branch with snapshot versions adds 3d31834 [jgitflow-maven-plugin]updating poms for branch'release/1.5.7' with non-snapshot versions adds 951c21b [jgitflow-maven-plugin]merging 'release/1.5.7' into 'master' No new revisions were added by this update. Summary of changes: .gitignore | 7 +- coser-ui/README.txt => README.md | 0 changelog.txt | 119 --------------------- .../changelog.txt => coser-business/README.md | 0 coser-business/README.txt | 0 coser-business/changelog.txt | 0 coser-business/pom.xml | 24 ++++- .../java/fr/ifremer/coser/CoserBusinessConfig.java | 2 +- .../fr/ifremer/coser/CoserBusinessException.java | 2 +- .../java/fr/ifremer/coser/CoserClassLoader.java | 2 +- .../main/java/fr/ifremer/coser/CoserConstants.java | 2 +- .../src/main/java/fr/ifremer/coser/CoserUtils.java | 2 +- .../ifremer/coser/bean/AbstractDataContainer.java | 2 +- .../java/fr/ifremer/coser/bean/AbstractEntity.java | 2 +- .../main/java/fr/ifremer/coser/bean/Control.java | 2 +- .../main/java/fr/ifremer/coser/bean/Project.java | 2 +- .../java/fr/ifremer/coser/bean/RSufiResult.java | 2 +- .../fr/ifremer/coser/bean/RSufiResultPath.java | 2 +- .../main/java/fr/ifremer/coser/bean/Selection.java | 2 +- .../fr/ifremer/coser/bean/SpeciesFieldType.java | 2 +- .../java/fr/ifremer/coser/bean/package-info.java | 2 +- .../ifremer/coser/command/CategoryLineCommand.java | 2 +- .../java/fr/ifremer/coser/command/Command.java | 2 +- .../ifremer/coser/command/DeleteLineCommand.java | 2 +- .../ifremer/coser/command/MergeSpeciesCommand.java | 2 +- .../ifremer/coser/command/ModifyFieldCommand.java | 2 +- .../fr/ifremer/coser/command/package-info.java | 2 +- .../fr/ifremer/coser/control/ControlError.java | 2 +- .../ifremer/coser/control/ControlErrorGroup.java | 2 +- .../coser/control/DiffCatchLengthControlError.java | 2 +- .../ifremer/coser/control/SpeciesControlError.java | 2 +- .../coser/control/SpeciesLengthControlError.java | 2 +- .../fr/ifremer/coser/control/package-info.java | 2 +- .../fr/ifremer/coser/data/AbstractDataEntity.java | 2 +- .../src/main/java/fr/ifremer/coser/data/Catch.java | 2 +- .../src/main/java/fr/ifremer/coser/data/Haul.java | 2 +- .../main/java/fr/ifremer/coser/data/Length.java | 2 +- .../main/java/fr/ifremer/coser/data/Strata.java | 2 +- .../java/fr/ifremer/coser/data/package-info.java | 2 +- .../fr/ifremer/coser/services/CommandService.java | 2 +- .../fr/ifremer/coser/services/CommonService.java | 2 +- .../fr/ifremer/coser/services/ControlService.java | 2 +- .../fr/ifremer/coser/services/ProjectService.java | 2 +- .../ifremer/coser/services/PublicationService.java | 2 +- .../java/fr/ifremer/coser/services/WebService.java | 2 +- .../fr/ifremer/coser/services/package-info.java | 2 +- .../java/fr/ifremer/coser/storage/DataStorage.java | 2 +- .../ifremer/coser/storage/MemoryDataStorage.java | 2 +- .../fr/ifremer/coser/storage/package-info.java | 2 +- .../java/fr/ifremer/coser/util/Coordinate.java | 2 +- .../main/java/fr/ifremer/coser/util/DataType.java | 2 +- .../coser/util/InputStreamKnownSizeBody.java | 2 +- .../fr/ifremer/coser/util/ProgressMonitor.java | 2 +- .../java/fr/ifremer/coser/util/ProgressReader.java | 2 +- .../java/fr/ifremer/coser/util/ProgressStream.java | 2 +- .../ifremer/coser/util/io/MultipleFileFilter.java | 2 +- .../coser/util/io/OneRSufiResultFileFilter.java | 2 +- .../java/fr/ifremer/coser/util/package-info.java | 2 +- .../coser/validators/AbstractFieldValidator.java | 2 +- .../validators/CoserCheckDoubleValidator.java | 2 +- .../coser/validators/CoserDoubleValidator.java | 2 +- .../coser/validators/RegexFieldValidator.java | 2 +- .../fr/ifremer/coser/validators/package-info.java | 2 +- .../src/main/resources/ftl/decharge_en.ftl | 2 +- .../src/main/resources/ftl/decharge_fr.ftl | 2 +- coser-business/src/main/resources/ftl/map.ftl | 2 +- .../src/main/resources/ftl/metainfo_en.ftl | 2 +- .../src/main/resources/ftl/metainfo_fr.ftl | 2 +- coser-business/src/main/resources/validators.xml | 2 +- .../ifremer/coser/data/Catch-error-validation.xml | 2 +- .../ifremer/coser/data/Haul-error-validation.xml | 2 +- .../ifremer/coser/data/Haul-fatal-validation.xml | 2 +- .../ifremer/coser/data/Haul-warning-validation.xml | 2 +- .../ifremer/coser/data/Length-error-validation.xml | 2 +- .../ifremer/coser/data/Strata-error-validation.xml | 2 +- .../test/java/fr/ifremer/coser/CoserUtilsTest.java | 2 +- .../ifremer/coser/services/CommandServiceTest.java | 2 +- .../ifremer/coser/services/CommonServiceTest.java | 2 +- .../ifremer/coser/services/ControlServiceTest.java | 2 +- .../ifremer/coser/services/CoserTestAbstract.java | 2 +- .../ifremer/coser/services/ProjectServiceTest.java | 2 +- .../coser/services/PublicationServiceTest.java | 2 +- .../fr/ifremer/coser/services/WebServiceTest.java | 2 +- .../coser/storage/MemoryDataStorageTest.java | 2 +- coser-business/src/test/resources/log4j.properties | 2 +- .../results/testresult1/result.properties | 2 +- .../results/testresult1/result.properties | 2 +- .../results/testresult2/result.properties | 2 +- README.txt => coser-ui/README.md | 0 coser-ui/changelog.txt | 0 coser-ui/pom.xml | 24 ++++- coser-ui/src/main/assembly/bin.xml | 2 +- coser-ui/src/main/assembly/coser | 2 +- coser-ui/src/main/java/fr/ifremer/coser/Coser.java | 2 +- .../main/java/fr/ifremer/coser/CoserConfig.java | 2 +- .../main/java/fr/ifremer/coser/CoserException.java | 2 +- .../fr/ifremer/coser/CoserExceptionHandler.java | 2 +- .../fr/ifremer/coser/ui/ContainerRedoMenu.java | 2 +- .../fr/ifremer/coser/ui/ContainerUndoMenu.java | 2 +- .../main/java/fr/ifremer/coser/ui/CoserFrame.jaxx | 2 +- .../fr/ifremer/coser/ui/CoserFrameHandler.java | 2 +- .../main/java/fr/ifremer/coser/ui/HomeView.jaxx | 2 +- .../fr/ifremer/coser/ui/SelectionsListMenu.java | 2 +- .../fr/ifremer/coser/ui/common/CommonHandler.java | 2 +- .../fr/ifremer/coser/ui/common/DataHandler.java | 2 +- .../ui/common/LengthStructureMatrixFilter.java | 2 +- .../coser/ui/common/SpeciesListRenderer.java | 2 +- .../coser/ui/common/SpeciesTableCellRenderer.java | 2 +- .../coser/ui/control/ControlCategoryListModel.java | 2 +- .../ui/control/ControlCategoryListRenderer.java | 2 +- .../coser/ui/control/ControlDataTableModel.java | 2 +- .../control/ControlDuplicatedLineTableModel.java | 2 +- .../coser/ui/control/ControlErrorTreeRenderer.java | 2 +- .../coser/ui/control/ControlFindReplaceDialog.jaxx | 2 +- .../coser/ui/control/ControlGraphFrame.jaxx | 2 +- .../ifremer/coser/ui/control/ControlHandler.java | 2 +- .../coser/ui/control/ControlTableModel.java | 2 +- .../fr/ifremer/coser/ui/control/ControlView.jaxx | 2 +- .../coser/ui/control/GlobalControlErrorModel.java | 2 +- .../ifremer/coser/ui/control/SpecyComboModel.java | 2 +- .../java/fr/ifremer/coser/ui/freize/Freize.jaxx | 2 +- .../fr/ifremer/coser/ui/freize/FreizeHandler.java | 2 +- .../fr/ifremer/coser/ui/freize/FreizeModel.java | 2 +- .../java/fr/ifremer/coser/ui/maps/CoserMap.java | 2 +- .../ifremer/coser/ui/maps/HaulLocationHandler.java | 2 +- .../coser/ui/option/ConfigurationHandler.java | 2 +- .../ifremer/coser/ui/option/ConfigurationView.jaxx | 2 +- .../ifremer/coser/ui/option/NoCopiedLayerUI.java | 2 +- .../fr/ifremer/coser/ui/option/OptionHandler.java | 2 +- .../ifremer/coser/ui/option/ValidatorDialog.jaxx | 2 +- .../coser/ui/option/ValidatorsTreeModel.java | 2 +- .../coser/ui/option/ValidatorsTreeRenderer.java | 2 +- .../coser/ui/project/ProjectCreationView.jaxx | 2 +- .../ifremer/coser/ui/project/ProjectEditView.jaxx | 2 +- .../ifremer/coser/ui/project/ProjectHandler.java | 2 +- .../coser/ui/project/ProjectMapsListModel.java | 2 +- .../coser/ui/project/ProjectNamesListModel.java | 2 +- .../ifremer/coser/ui/project/ProjectOpenView.jaxx | 2 +- .../coser/ui/project/ProjectSummaryView.jaxx | 2 +- .../ui/project/SpeciesFieldTypeListRenderer.java | 2 +- .../coser/ui/publication/ExportUploadDialog.jaxx | 2 +- .../coser/ui/publication/GlobalResultHandler.java | 2 +- .../ui/publication/SelectUploadResultView.jaxx | 2 +- .../coser/ui/result/ExportUploadDialog.jaxx | 2 +- .../fr/ifremer/coser/ui/result/ResultHandler.java | 2 +- .../ifremer/coser/ui/result/ResultTableModel.java | 2 +- .../coser/ui/result/ResultTableRenderer.java | 2 +- .../coser/ui/result/RsufiResultRenderer.java | 2 +- .../coser/ui/result/RsufiResultTableModel.java | 2 +- .../coser/ui/result/RsufiResultZoneRenderer.java | 2 +- .../coser/ui/result/SelectUploadResultView.jaxx | 2 +- .../coser/ui/result/SelectionAddResultDialog.jaxx | 2 +- .../coser/ui/result/SelectionEditResultDialog.jaxx | 2 +- .../ifremer/coser/ui/result/ZoneComboBoxModel.java | 2 +- .../coser/ui/result/ZoneComboBoxRenderer.java | 2 +- .../coser/ui/selection/SamplingEffortRenderer.java | 2 +- .../coser/ui/selection/SelectionDetailsView.jaxx | 2 +- .../coser/ui/selection/SelectionFilesView.jaxx | 2 +- .../coser/ui/selection/SelectionHandler.java | 2 +- .../coser/ui/selection/SelectionListsView.jaxx | 2 +- .../coser/ui/selection/SelectionRsufiView.jaxx | 2 +- .../ifremer/coser/ui/selection/SelectionView.jaxx | 2 +- .../coser/ui/selection/SpeciesFusionDialog.jaxx | 2 +- .../ui/selection/SpeciesListOccDensRenderer.java | 2 +- .../coser/ui/selection/SpeciesTypesRenderer.java | 2 +- .../coser/ui/selection/model/FileListModel.java | 2 +- .../selection/model/MaturitySpeciesListModel.java | 2 +- .../model/OccurrenceDensitySpeciesListModel.java | 2 +- .../model/SizeAllYearSpeciesListModel.java | 2 +- .../coser/ui/selection/model/SpeciesListModel.java | 2 +- .../ui/selection/model/SpeciesTypesListModel.java | 2 +- .../coser/ui/selection/model/StrataListModel.java | 2 +- .../coser/ui/selection/model/YearListModel.java | 2 +- .../ui/selection/replay/CommandListModel.java | 2 +- .../ui/selection/replay/CommandListRenderer.java | 2 +- .../replay/SelectionByProjectTreeModel.java | 2 +- .../selection/replay/SelectionReplayHandler.java | 2 +- .../ui/selection/replay/SelectionReplayView.jaxx | 2 +- .../fr/ifremer/coser/ui/util/CoserListModel.java | 2 +- .../coser/ui/util/CoserListSelectionModel.java | 2 +- .../fr/ifremer/coser/ui/util/CoserProgressBar.java | 2 +- .../java/fr/ifremer/coser/ui/util/ErrorHelper.java | 2 +- .../coser/ui/widgets/LookAndFeelViewMenuItem.java | 2 +- coser-ui/src/main/resources/coser.properties | 2 +- .../coser/bean/Project-error-validation.xml | 2 +- .../coser/bean/RSufiResult-error-validation.xml | 2 +- coser-ui/src/main/resources/log4j.properties | 2 +- coser-web/{README.txt => README.md} | 0 coser-web/pom.xml | 24 ++++- .../java/fr/ifremer/coser/web/CoserWebConfig.java | 2 +- .../fr/ifremer/coser/web/CoserWebException.java | 2 +- .../ifremer/coser/web/actions/DocumentsAction.java | 2 +- .../fr/ifremer/coser/web/actions/IndexAction.java | 2 +- .../fr/ifremer/coser/web/actions/LocaleAction.java | 2 +- .../ifremer/coser/web/actions/QualityAction.java | 2 +- .../fr/ifremer/coser/web/actions/SurveyAction.java | 2 +- .../coser/web/actions/UploadResultAction.java | 2 +- .../web/actions/admin/DeleteProjectsAction.java | 2 +- .../coser/web/actions/admin/IndexAction.java | 2 +- .../web/actions/admin/ListProjectsAction.java | 2 +- .../coser/web/actions/auth/LoginAction.java | 2 +- .../coser/web/actions/auth/LoginInterceptor.java | 2 +- .../coser/web/actions/auth/PerformLoginAction.java | 2 +- .../coser/web/actions/com/FacadeAction.java | 2 +- .../ifremer/coser/web/actions/com/GraphAction.java | 2 +- .../coser/web/actions/com/GraphDataAction.java | 2 +- .../coser/web/actions/com/GraphDownloadAction.java | 2 +- .../coser/web/actions/com/IndicatorAction.java | 2 +- .../ifremer/coser/web/actions/com/ZoneAction.java | 2 +- .../web/actions/common/AbstractCoserJspAction.java | 2 +- .../coser/web/actions/common/CommonFacade.java | 2 +- .../coser/web/actions/common/CommonIndicator.java | 2 +- .../coser/web/actions/common/CommonZone.java | 2 +- .../coser/web/actions/map/FacadeAction.java | 2 +- .../ifremer/coser/web/actions/map/MapAction.java | 2 +- .../coser/web/actions/map/MapDataAction.java | 2 +- .../coser/web/actions/map/SpeciesAction.java | 2 +- .../ifremer/coser/web/actions/map/ZoneAction.java | 2 +- .../coser/web/actions/pop/FacadeAction.java | 2 +- .../ifremer/coser/web/actions/pop/GraphAction.java | 2 +- .../coser/web/actions/pop/GraphDataAction.java | 2 +- .../coser/web/actions/pop/GraphDownloadAction.java | 2 +- .../coser/web/actions/pop/IndicatorAction.java | 2 +- .../coser/web/actions/pop/SpeciesAction.java | 2 +- .../ifremer/coser/web/actions/pop/ZoneAction.java | 2 +- .../coser/web/actions/search/ExtractAction.java | 2 +- .../coser/web/actions/source/FacadeAction.java | 2 +- .../coser/web/actions/source/SourceAction.java | 2 +- .../coser/web/actions/source/SourceDataAction.java | 2 +- .../web/actions/source/SourceQualityAction.java | 2 +- .../coser/web/actions/source/ZoneAction.java | 2 +- coser-web/src/main/resources/coserweb.properties | 2 +- coser-web/src/main/resources/log4j.properties | 2 +- coser-web/src/main/resources/struts.xml | 2 +- .../main/webapp/WEB-INF/content/admin/index.jsp | 2 +- .../webapp/WEB-INF/content/admin/list-projects.jsp | 2 +- .../WEB-INF/content/admin/perform-login-input.jsp | 2 +- .../src/main/webapp/WEB-INF/content/auth/login.jsp | 2 +- .../src/main/webapp/WEB-INF/content/com/facade.jsp | 2 +- .../src/main/webapp/WEB-INF/content/com/graph.jsp | 2 +- .../main/webapp/WEB-INF/content/com/indicator.jsp | 2 +- .../src/main/webapp/WEB-INF/content/com/zone.jsp | 2 +- .../src/main/webapp/WEB-INF/content/documents.jsp | 2 +- .../src/main/webapp/WEB-INF/content/index.jsp | 2 +- .../src/main/webapp/WEB-INF/content/map/facade.jsp | 2 +- .../src/main/webapp/WEB-INF/content/map/map.jsp | 2 +- .../main/webapp/WEB-INF/content/map/species.jsp | 2 +- .../src/main/webapp/WEB-INF/content/map/zone.jsp | 2 +- .../src/main/webapp/WEB-INF/content/pop/facade.jsp | 2 +- .../src/main/webapp/WEB-INF/content/pop/graph.jsp | 2 +- .../main/webapp/WEB-INF/content/pop/indicator.jsp | 2 +- .../main/webapp/WEB-INF/content/pop/species.jsp | 2 +- .../src/main/webapp/WEB-INF/content/pop/zone.jsp | 2 +- .../src/main/webapp/WEB-INF/content/quality.jsp | 2 +- .../WEB-INF/content/search/extract-input.jsp | 2 +- .../WEB-INF/content/search/extract-success.jsp | 2 +- .../webapp/WEB-INF/content/search/extract-wait.jsp | 2 +- .../main/webapp/WEB-INF/content/source/facade.jsp | 2 +- .../webapp/WEB-INF/content/source/source-data.jsp | 2 +- .../WEB-INF/content/source/source-quality.jsp | 2 +- .../main/webapp/WEB-INF/content/source/source.jsp | 2 +- .../main/webapp/WEB-INF/content/source/zone.jsp | 2 +- .../src/main/webapp/WEB-INF/content/survey.jsp | 2 +- .../WEB-INF/content/upload-result-success.jsp | 2 +- .../main/webapp/WEB-INF/content/upload-result.jsp | 2 +- coser-web/src/main/webapp/WEB-INF/decorators.xml | 2 +- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 4 +- .../main/webapp/WEB-INF/decorators/sublayout.jsp | 4 +- coser-web/src/main/webapp/WEB-INF/web.xml | 2 +- .../src/main/webapp/images/logo_ministere.jpg | Bin 10526 -> 39532 bytes coser-web/src/main/webapp/images/zones/Solper.png | Bin 0 -> 22640 bytes coser-web/src/main/webapp/js/coser.js | 2 +- coser-web/src/main/webapp/styles/coser.css | 2 +- pom.xml | 56 +++++++--- src/site/en/rst/devel/textupdate.rst | 2 +- src/site/en/rst/download.rst | 2 +- src/site/en/rst/index.rst | 2 +- src/site/en/rst/user/configuration.rst | 2 +- src/site/en/rst/user/controls.rst | 2 +- src/site/en/rst/user/dataformat.rst | 2 +- src/site/en/rst/user/faq.rst | 2 +- src/site/en/rst/user/guide_control.rst | 2 +- src/site/en/rst/user/guide_listcontrols.rst | 2 +- src/site/en/rst/user/guide_project.rst | 2 +- src/site/en/rst/user/guide_results.rst | 2 +- src/site/en/rst/user/guide_selection.rst | 2 +- src/site/rst/devel/directory.rst | 2 +- src/site/rst/devel/struts.rst | 2 +- src/site/rst/devel/textupdate.rst | 2 +- src/site/rst/download.rst | 2 +- src/site/rst/index.rst | 2 +- src/site/rst/user/configuration.rst | 2 +- src/site/rst/user/controls.rst | 2 +- src/site/rst/user/dataformat.rst | 2 +- src/site/rst/user/faq.rst | 2 +- src/site/rst/user/guide_control.rst | 2 +- src/site/rst/user/guide_listcontrols.rst | 2 +- src/site/rst/user/guide_project.rst | 2 +- src/site/rst/user/guide_results.rst | 2 +- src/site/rst/user/guide_selection.rst | 2 +- src/site/site_en.xml | 9 +- src/site/site_fr.xml | 9 +- 302 files changed, 418 insertions(+), 428 deletions(-) rename coser-ui/README.txt => README.md (100%) delete mode 100644 changelog.txt rename coser-web/changelog.txt => coser-business/README.md (100%) delete mode 100644 coser-business/README.txt delete mode 100644 coser-business/changelog.txt rename README.txt => coser-ui/README.md (100%) delete mode 100644 coser-ui/changelog.txt rename coser-web/{README.txt => README.md} (100%) create mode 100644 coser-web/src/main/webapp/images/zones/Solper.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.