This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 2379fdd POM en 4.3-SNAPSHOT new 368edb5 On permet de mettre l'utilisateur dans un laboratoire et non plus seulement dans une société new 8a9d440 Liste des laboratoires, création, modification et suppression d'un laboratoire new f7a23fa Ajout de la notion de laboratoire Ifremer (fixes #2262) new 759d2d0 Pour les tests, ajout d'un fichier d'exemple new 4fc2981 Ajout d'un service d'import des espèces new 0715813 Ajout de l'interface utilisateur d'import du référentiel des espèces new 296e68e Ajout d'un référentiel d'espèces cibles (refs #5973) new 368202f Tri bundle new 159153c Correction d'un bogue suscité par l'utilisation de instanceof sur des entités Hibernate The 9 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 159153cd5a22762d30dce0564dc828478230ec63 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 4 15:24:09 2014 +0100 Correction d'un bogue suscité par l'utilisation de instanceof sur des entités Hibernate commit 368202f343177e4b963838adfc5b3357e6815d17 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 4 15:23:58 2014 +0100 Tri bundle commit 296e68e04635a8f8f9de9412098b6e6ff9688b7a Merge: f7a23fa 0715813 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 4 15:09:13 2014 +0100 Ajout d'un référentiel d'espèces cibles (refs #5973) commit f7a23face43333e21c40740a0b100f93c7e5425b Merge: 2379fdd 8a9d440 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 4 15:08:06 2014 +0100 Ajout de la notion de laboratoire Ifremer (fixes #2262) commit 8a9d440f78fb7eaad409410c2140396b437b68ec Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 4 15:05:11 2014 +0100 Liste des laboratoires, création, modification et suppression d'un laboratoire commit 368edb58da440be4e7425fc224006e754cded078 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 4 10:53:24 2014 +0100 On permet de mettre l'utilisateur dans un laboratoire et non plus seulement dans une société commit 0715813fe4309dcefc4d6a8aabd5c4c18c8abcd8 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Dec 2 17:59:07 2014 +0100 Ajout de l'interface utilisateur d'import du référentiel des espèces commit 4fc29810f4a401498baba3ef8c7e3fb28bea5825 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Dec 2 17:22:50 2014 +0100 Ajout d'un service d'import des espèces commit 759d2d00c668c55f378c3c3f5a40a76cf3e8ef9a Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Dec 2 14:08:22 2014 +0100 Pour les tests, ajout d'un fichier d'exemple Summary of changes: .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 16 +++++ .../java/fr/ifremer/wao/entity/CompanyImpl.java | 10 +++ .../java/fr/ifremer/wao/entity/LaboratoryImpl.java | 12 ++++ .../java/fr/ifremer/wao/entity/WaoUserImpl.java | 8 +-- .../V4_3__add_species,_add_laboratories.sql | 1 + wao-persistence/src/main/xmi/wao-model.zargo | Bin 61426 -> 61366 bytes .../ifremer/wao/services/AuthenticatedWaoUser.java | 6 +- .../fr/ifremer/wao/services/ObsMerFixtures.java | 4 +- .../wao/services/service/WaoServiceSupport.java | 15 +++++ .../service/administration/CompaniesService.java | 36 ++++------- .../administration/LaboratoriesService.java | 71 +++++++++++++++++++++ ... => OrganisationNameMustBeUniqueException.java} | 2 +- .../administration/OrganisationsService.java | 55 ++++++++++++++++ .../service/administration/ReferentialService.java | 44 ++++++++++++- .../administration/UpdateWaoUserCommand.java | 32 +++++----- .../service/administration/WaoUsersService.java | 28 ++++---- .../services/service/csv/SpeciesImportModel.java | 24 +++++++ .../administration/ReferentialServiceTest.java | 16 +++++ wao-services/src/test/resources/import/especes.csv | 5 ++ .../fr/ifremer/wao/web/WaoJspActionSupport.java | 4 ++ ...panyAction.java => DeleteLaboratoryAction.java} | 25 ++++---- .../action/administration/EditCompanyAction.java | 6 +- ...ompanyAction.java => EditLaboratoryAction.java} | 48 +++++++------- .../action/administration/EditWaoUserAction.java | 16 +++-- .../action/administration/ImportSpeciesAction.java | 18 ++++++ ...ompaniesAction.java => LaboratoriesAction.java} | 18 +++--- .../web/action/administration/WaoUsersAction.java | 14 ++-- .../main/resources/i18n/wao-web_en_GB.properties | 13 +++- .../main/resources/i18n/wao-web_fr_FR.properties | 13 +++- .../content/administration/edit-laboratory.jsp | 67 +++++++++++++++++++ .../content/administration/edit-wao-user.jsp | 16 ++--- .../{companies.jsp => laboratories.jsp} | 34 +++++----- .../administration/referential-management.jsp | 18 ++++++ .../src/main/webapp/WEB-INF/decorators/layout.jsp | 8 +++ 34 files changed, 548 insertions(+), 155 deletions(-) create mode 100644 wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoTopiaDao.java create mode 100644 wao-persistence/src/main/java/fr/ifremer/wao/entity/LaboratoryImpl.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java rename wao-services/src/main/java/fr/ifremer/wao/services/service/administration/{CompanyNameMustBeUniqueException.java => OrganisationNameMustBeUniqueException.java} (92%) create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/administration/OrganisationsService.java create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java create mode 100644 wao-services/src/test/resources/import/especes.csv copy wao-web/src/main/java/fr/ifremer/wao/web/action/administration/{DeleteCompanyAction.java => DeleteLaboratoryAction.java} (68%) copy wao-web/src/main/java/fr/ifremer/wao/web/action/administration/{EditCompanyAction.java => EditLaboratoryAction.java} (55%) create mode 100644 wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportSpeciesAction.java copy wao-web/src/main/java/fr/ifremer/wao/web/action/administration/{CompaniesAction.java => LaboratoriesAction.java} (69%) create mode 100644 wao-web/src/main/webapp/WEB-INF/content/administration/edit-laboratory.jsp copy wao-web/src/main/webapp/WEB-INF/content/administration/{companies.jsp => laboratories.jsp} (71%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.