This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 8c8e421c42e2bd3cd8453f57adcf8a1377b41aa8 Merge: 3376104 d8bdca7 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:08:54 2015 +0000 Merge branch 'release/5.0-RC1' pom.xml | 22 +- wao-persistence/pom.xml | 2 +- .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 50 +++ .../main/java/fr/ifremer/wao/SampleRowsFilter.java | 68 ++- .../fr/ifremer/wao/WaoTopiaPersistenceContext.java | 10 +- .../src/main/java/fr/ifremer/wao/WaoUtils.java | 62 ++- .../java/fr/ifremer/wao/entity/BoatTopiaDao.java | 2 +- .../main/java/fr/ifremer/wao/entity/Companies.java | 9 +- .../java/fr/ifremer/wao/entity/CompanyImpl.java | 10 + .../java/fr/ifremer/wao/entity/ContactImpl.java | 26 -- .../java/fr/ifremer/wao/entity/ContactState.java | 1 + .../fr/ifremer/wao/entity/ContactTopiaDao.java | 40 +- .../wao/entity/IndividualMeasurementStrategy.java | 60 +++ .../java/fr/ifremer/wao/entity/LaboratoryImpl.java | 16 +- .../java/fr/ifremer/wao/entity/ObsProgram.java | 7 +- .../fr/ifremer/wao/entity/OrganisationImpl.java | 9 +- .../entity/{WaoUsers.java => Organisations.java} | 28 +- .../java/fr/ifremer/wao/entity/SampleRowImpl.java | 35 +- .../fr/ifremer/wao/entity/SampleRowLogImpl.java | 94 ++++- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 35 +- .../entity/SclerochronologySamplingContext.java | 73 ++++ .../wao/entity/{Companies.java => Specieses.java} | 15 +- .../java/fr/ifremer/wao/entity/WaoUserImpl.java | 6 + .../fr/ifremer/wao/entity/WaoUserTopiaDao.java | 2 +- .../main/java/fr/ifremer/wao/entity/WaoUsers.java | 16 + ...ies,_add_laboratories,_add_sclerochronology.sql | 81 ++++ .../i18n/wao-persistence_en_GB.properties | 8 + .../i18n/wao-persistence_fr_FR.properties | 8 + wao-persistence/src/main/xmi/wao-model.properties | 21 +- wao-persistence/src/main/xmi/wao-model.zargo | Bin 59661 -> 62318 bytes wao-services/pom.xml | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 19 +- .../fr/ifremer/wao/services/ObsMerFixtures.java | 222 ---------- .../wao/services/service/BoatsFilterValues.java | 10 +- .../ifremer/wao/services/service/BoatsService.java | 69 ++- .../{ObsMerContactsList.java => ContactsList.java} | 8 +- .../wao/services/service/ContactsService.java | 469 +++++++++++++-------- ...n.java => IllegalSampleReceptionException.java} | 12 +- ...eption.java => IllegalSampleSizeException.java} | 12 +- ....java => IllegalSampleSubmissionException.java} | 12 +- ...n.java => IllegalSampleTreatmentException.java} | 12 +- .../wao/services/service/InitWaoService.java | 9 +- ...ismatchContactMainObserverCompanyException.java | 12 +- ...chContactSecondaryObserverCompanyException.java | 12 +- ...ingIndividualMeasurementStrategyException.java} | 12 +- ...n.java => MissingSampleReceptionException.java} | 12 +- ...eption.java => MissingSampleSizeException.java} | 12 +- ....java => MissingSampleSubmissionException.java} | 12 +- ...gSclerochronologySamplingContextException.java} | 12 +- ...Exception.java => MissingSpeciesException.java} | 12 +- .../service/ObsMerSamplingPlanBuilder.java | 2 +- .../service/ObsMerSamplingPlanService.java | 40 +- .../services/service/SampleRowsFilterValues.java | 106 +++-- .../ifremer/wao/services/service/SamplingPlan.java | 60 +-- .../wao/services/service/SamplingPlanService.java | 197 ++++++--- .../service/SclerochronologySamplingPlan.java | 179 ++++++++ ...va => SclerochronologySamplingPlanBuilder.java} | 200 ++++----- .../SclerochronologySamplingPlanService.java | 93 ++++ .../fr/ifremer/wao/services/service/Synthesis.java | 5 +- .../wao/services/service/SynthesisService.java | 68 +-- .../services/service/UpdateSampleRowCommand.java | 93 +++- .../wao/services/service/WaoServiceSupport.java | 33 ++ .../service/administration/CompaniesService.java | 38 +- .../administration/LaboratoriesService.java | 112 +++++ .../service/administration/NewsService.java | 4 +- ... => OrganisationNameMustBeUniqueException.java} | 2 +- .../administration/OrganisationsService.java | 115 +++++ .../service/administration/ReferentialService.java | 122 +++--- .../administration/UpdateWaoUserCommand.java | 41 +- .../service/administration/WaoUsersList.java | 65 +++ .../service/administration/WaoUsersService.java | 65 +-- .../service/csv/ContactImportExportModel.java | 46 +- ...del.java => SamplingPlanImportExportModel.java} | 63 ++- .../services/service/csv/SpeciesImportModel.java | 55 +++ ...atter.java => OrganisationParserFormatter.java} | 48 ++- ...rFormatter.java => SpeciesParserFormatter.java} | 57 ++- .../resources/i18n/wao-services_en_GB.properties | 16 +- .../resources/i18n/wao-services_fr_FR.properties | 14 +- .../wao/services/service/BoatsServiceTest.java | 1 - .../wao/services/service/ContactsServiceTest.java | 96 ++++- .../wao/services/service/ObsMerFixtures.java | 93 ++++ .../service/ObsMerSamplingPlanServiceTest.java | 1 - .../services/service/SclerochronologyFixtures.java | 138 ++++++ .../SclerochronologySamplingPlanServiceTest.java | 198 +++++++++ .../ifremer/wao/services/service/WaoFixtures.java | 140 ++++++ .../administration/ReferentialServiceTest.java | 16 + ...java => SamplingPlanImportExportModelTest.java} | 6 +- .../import/contacts-sclerochronologie.csv | 2 + .../src/test/resources/import/echantillonnage.csv | 20 +- wao-services/src/test/resources/import/especes.csv | 5 + .../resources/import/plan-sclerochronologie.csv | 6 + .../test/resources/import/samplingPlan-obsdeb.csv | 3 - wao-web/pom.xml | 5 +- .../fr/ifremer/wao/web/WaoJspActionSupport.java | 4 + .../wao/web/action/AbstractImportCsvAction.java | 8 +- .../fr/ifremer/wao/web/action/ContactsAction.java | 4 +- .../wao/web/action/CreateContactAction.java | 6 +- .../ifremer/wao/web/action/EditContactAction.java | 60 ++- .../wao/web/action/EditSampleRowAction.java | 15 +- .../action/SampleRowsFilterValuesJsonAction.java | 34 +- .../wao/web/action/ValidateContactJsonAction.java | 96 ++--- .../administration/DeleteLaboratoryAction.java | 73 ++++ .../action/administration/EditCompanyAction.java | 6 +- .../administration/EditLaboratoryAction.java | 125 ++++++ .../action/administration/EditWaoUserAction.java | 20 +- .../action/administration/ImportSpeciesAction.java | 33 +- .../action/administration/LaboratoriesAction.java | 43 +- .../web/action/administration/WaoUsersAction.java | 25 +- .../sclerochronology/SamplingPlanAction.java | 26 +- .../wao/entity/Contact-conversion.properties | 5 +- .../SamplingPlanAction-conversion.properties} | 12 +- .../main/resources/i18n/wao-web_en_GB.properties | 36 +- .../main/resources/i18n/wao-web_fr_FR.properties | 38 +- .../WEB-INF/content/administration/companies.jsp | 4 +- .../content/administration/edit-laboratory.jsp | 77 ++++ .../content/administration/edit-wao-user.jsp | 20 +- .../{companies.jsp => laboratories.jsp} | 34 +- .../administration/referential-management.jsp | 80 ++-- .../WEB-INF/content/administration/wao-users.jsp | 26 +- .../main/webapp/WEB-INF/content/boat-details.jsp | 40 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 225 +++++++--- .../webapp/WEB-INF/content/edit-contact-input.jsp | 158 ++++--- .../WEB-INF/content/edit-sample-row-input.jsp | 127 ++++-- .../WEB-INF/content/obsmer/sampling-plan.jsp | 8 +- .../WEB-INF/content/obsvente/sampling-plan.jsp | 8 +- .../sampling-plan.jsp | 135 ++---- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 309 +++++++------- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 28 +- wao-web/src/main/webapp/wao.css | 4 +- 129 files changed, 4459 insertions(+), 1930 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.