branch develop updated (6e20d44 -> 238d604)
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 6e20d44 On permet de modifier les membres d'un labo directement depuis le formulaire de modification du labo (fixes #6489) new 9f8ac82 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 696e106 [jgitflow-maven-plugin]updating poms for branch '5.0-RC1' with snapshot versions new 8e70298 Utilisation de la dernière version de pom new ce0ced0 Ajout des entêtes manquants new d8bdca7 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC1' with non-snapshot versions new 8c8e421 Merge branch 'release/5.0-RC1' new 72836a5 Merge branch 'master' into develop new 238d604 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 7 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 238d604a61d25d1cc246e9580dc03b86261f7df3 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:08:56 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 72836a566ba576b1332488e6889f38a97682f1a8 Merge: 9f8ac82 8c8e421 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:08:56 2015 +0000 Merge branch 'master' into develop commit 9f8ac825bdc505411111fcd31ed3cd60295a971b Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:08:55 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts 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' commit d8bdca7f2122b97125c61927896fe168726b693f Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:05:50 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC1' with non-snapshot versions commit ce0ced08822bf954495e7bfe9ce81d867215a991 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:05:29 2015 +0000 Ajout des entêtes manquants commit 8e702988cfff694fc26aab2b0c9e642a8bbcbf01 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:58:02 2015 +0000 Utilisation de la dernière version de pom Summary of changes: pom.xml | 2 +- .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 21 +++++++++++++++++++++ .../wao/entity/IndividualMeasurementStrategy.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/LaboratoryImpl.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/Organisations.java | 21 +++++++++++++++++++++ .../wao/entity/SclerochronologySamplingContext.java | 21 +++++++++++++++++++++ .../main/java/fr/ifremer/wao/entity/Specieses.java | 21 +++++++++++++++++++++ .../service/IllegalSampleReceptionException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleSizeException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleSubmissionException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleTreatmentException.java | 21 +++++++++++++++++++++ ...ssingIndividualMeasurementStrategyException.java | 21 +++++++++++++++++++++ .../service/MissingSampleReceptionException.java | 21 +++++++++++++++++++++ .../service/MissingSampleSizeException.java | 21 +++++++++++++++++++++ .../service/MissingSampleSubmissionException.java | 21 +++++++++++++++++++++ ...ingSclerochronologySamplingContextException.java | 21 +++++++++++++++++++++ .../services/service/MissingSpeciesException.java | 21 +++++++++++++++++++++ .../service/administration/LaboratoriesService.java | 21 +++++++++++++++++++++ .../administration/OrganisationsService.java | 21 +++++++++++++++++++++ .../service/administration/WaoUsersList.java | 21 +++++++++++++++++++++ .../services/service/csv/SpeciesImportModel.java | 21 +++++++++++++++++++++ .../csv/operations/SpeciesParserFormatter.java | 21 +++++++++++++++++++++ .../services/service/SclerochronologyFixtures.java | 21 +++++++++++++++++++++ .../SclerochronologySamplingPlanServiceTest.java | 21 +++++++++++++++++++++ .../ifremer/wao/services/service/WaoFixtures.java | 21 +++++++++++++++++++++ .../action/administration/ImportSpeciesAction.java | 21 +++++++++++++++++++++ .../SamplingPlanAction-conversion.properties | 20 ++++++++++++++++++++ 27 files changed, 546 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 8e702988cfff694fc26aab2b0c9e642a8bbcbf01 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:58:02 2015 +0000 Utilisation de la dernière version de pom --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eeedd87..03c6a12 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>1.5</version> + <version>1.8.1</version> </parent> <groupId>fr.ifremer</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 ce0ced08822bf954495e7bfe9ce81d867215a991 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:05:29 2015 +0000 Ajout des entêtes manquants --- .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 21 +++++++++++++++++++++ .../wao/entity/IndividualMeasurementStrategy.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/LaboratoryImpl.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/Organisations.java | 21 +++++++++++++++++++++ .../wao/entity/SclerochronologySamplingContext.java | 21 +++++++++++++++++++++ .../main/java/fr/ifremer/wao/entity/Specieses.java | 21 +++++++++++++++++++++ .../service/IllegalSampleReceptionException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleSizeException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleSubmissionException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleTreatmentException.java | 21 +++++++++++++++++++++ ...ssingIndividualMeasurementStrategyException.java | 21 +++++++++++++++++++++ .../service/MissingSampleReceptionException.java | 21 +++++++++++++++++++++ .../service/MissingSampleSizeException.java | 21 +++++++++++++++++++++ .../service/MissingSampleSubmissionException.java | 21 +++++++++++++++++++++ ...ingSclerochronologySamplingContextException.java | 21 +++++++++++++++++++++ .../services/service/MissingSpeciesException.java | 21 +++++++++++++++++++++ .../service/administration/LaboratoriesService.java | 21 +++++++++++++++++++++ .../administration/OrganisationsService.java | 21 +++++++++++++++++++++ .../service/administration/WaoUsersList.java | 21 +++++++++++++++++++++ .../services/service/csv/SpeciesImportModel.java | 21 +++++++++++++++++++++ .../csv/operations/SpeciesParserFormatter.java | 21 +++++++++++++++++++++ .../services/service/SclerochronologyFixtures.java | 21 +++++++++++++++++++++ .../SclerochronologySamplingPlanServiceTest.java | 21 +++++++++++++++++++++ .../ifremer/wao/services/service/WaoFixtures.java | 21 +++++++++++++++++++++ .../action/administration/ImportSpeciesAction.java | 21 +++++++++++++++++++++ .../SamplingPlanAction-conversion.properties | 20 ++++++++++++++++++++ 26 files changed, 545 insertions(+) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoTopiaDao.java b/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoTopiaDao.java index 109dc80..67103d7 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoTopiaDao.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/AbstractWaoTopiaDao.java @@ -1,5 +1,26 @@ package fr.ifremer.wao; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import org.apache.commons.collections4.CollectionUtils; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.internal.AbstractTopiaDao; diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java index 0f69565..fb9d274 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/IndividualMeasurementStrategy.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.entity; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import static org.nuiton.i18n.I18n.n; /** diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/LaboratoryImpl.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/LaboratoryImpl.java index eada015..a7afb28 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/LaboratoryImpl.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/LaboratoryImpl.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.entity; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + public class LaboratoryImpl extends LaboratoryAbstract { diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java index b92e39e..357e825 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/Organisations.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.entity; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import com.google.common.base.Function; import com.google.common.collect.Ordering; diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/SclerochronologySamplingContext.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/SclerochronologySamplingContext.java index 0897a9c..ca1c677 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/SclerochronologySamplingContext.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/SclerochronologySamplingContext.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.entity; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import static org.nuiton.i18n.I18n.n; diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/Specieses.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/Specieses.java index f7f12d6..1b15d11 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/Specieses.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/Specieses.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.entity; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import com.google.common.base.Function; public class Specieses { diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleReceptionException.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleReceptionException.java index d20542c..29042f1 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleReceptionException.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleReceptionException.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; public class IllegalSampleReceptionException extends ContactValidationException { diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleSizeException.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleSizeException.java index 59ba3ff..92d69ae 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleSizeException.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleSizeException.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; public class IllegalSampleSizeException extends ContactValidationException { diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleSubmissionException.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleSubmissionException.java index 9f1fdeb..2361b98 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleSubmissionException.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleSubmissionException.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; public class IllegalSampleSubmissionException extends ContactValidationException { diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleTreatmentException.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleTreatmentException.java index 477489a..a84a461 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleTreatmentException.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/IllegalSampleTreatmentException.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; public class IllegalSampleTreatmentException extends ContactValidationException { diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingIndividualMeasurementStrategyException.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingIndividualMeasurementStrategyException.java index 1886359..baed833 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingIndividualMeasurementStrategyException.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingIndividualMeasurementStrategyException.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import fr.ifremer.wao.entity.SampleRow; public class MissingIndividualMeasurementStrategyException extends SampleRowValidationException { diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleReceptionException.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleReceptionException.java index 706f7bc..44fe8a1 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleReceptionException.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleReceptionException.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; public class MissingSampleReceptionException extends ContactValidationException { diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleSizeException.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleSizeException.java index fcbd2ca..3a08c03 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleSizeException.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleSizeException.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; public class MissingSampleSizeException extends ContactValidationException { diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleSubmissionException.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleSubmissionException.java index a36db05..879e2b3 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleSubmissionException.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSampleSubmissionException.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import fr.ifremer.wao.entity.Contact; public class MissingSampleSubmissionException extends ContactValidationException { diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSclerochronologySamplingContextException.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSclerochronologySamplingContextException.java index 212018a..d903fcf 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSclerochronologySamplingContextException.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSclerochronologySamplingContextException.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import fr.ifremer.wao.entity.SampleRow; public class MissingSclerochronologySamplingContextException extends SampleRowValidationException { diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSpeciesException.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSpeciesException.java index 2a6507f..e25711b 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSpeciesException.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/MissingSpeciesException.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import fr.ifremer.wao.entity.SampleRow; public class MissingSpeciesException extends SampleRowValidationException { diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java index a24dbde..0daf1c5 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service.administration; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import com.google.common.base.Optional; import com.google.common.collect.ImmutableSortedSet; import fr.ifremer.wao.entity.Company; diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/OrganisationsService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/OrganisationsService.java index 8782025..f386efe 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/OrganisationsService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/OrganisationsService.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service.administration; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import com.google.common.collect.Iterables; import fr.ifremer.wao.entity.Laboratory; import fr.ifremer.wao.entity.ObsProgram; diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersList.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersList.java index b53508a..aeab72d 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersList.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersList.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service.administration; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableSortedSet; diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java index 90a1fe0..f8acb84 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SpeciesImportModel.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service.csv; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import fr.ifremer.wao.entity.Species; import fr.ifremer.wao.entity.SpeciesImpl; import org.nuiton.csv.ValueParser; diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SpeciesParserFormatter.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SpeciesParserFormatter.java index 92bea35..f14b505 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SpeciesParserFormatter.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/csv/operations/SpeciesParserFormatter.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service.csv.operations; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; diff --git a/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologyFixtures.java b/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologyFixtures.java index 77a5bfa..0dc2140 100644 --- a/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologyFixtures.java +++ b/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologyFixtures.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import com.google.common.base.Optional; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Contact; diff --git a/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java b/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java index 0a843f9..89eabca 100644 --- a/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java +++ b/wao-services/src/test/java/fr/ifremer/wao/services/service/SclerochronologySamplingPlanServiceTest.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import com.google.common.base.Optional; import com.google.common.collect.Iterables; import fr.ifremer.wao.SampleRowsFilter; diff --git a/wao-services/src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java b/wao-services/src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java index f85e3a7..4a5262c 100644 --- a/wao-services/src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java +++ b/wao-services/src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.services.service; +/* + * #%L + * Wao :: Services + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import com.google.common.collect.Iterables; import fr.ifremer.wao.WaoTechnicalException; import fr.ifremer.wao.entity.Company; diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportSpeciesAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportSpeciesAction.java index d21b8cc..a683250 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportSpeciesAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/ImportSpeciesAction.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.web.action.administration; +/* + * #%L + * Wao :: Web + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * 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 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/>. + * #L% + */ + import fr.ifremer.wao.services.service.ImportErrorException; import java.io.InputStream; diff --git a/wao-web/src/main/resources/fr/ifremer/wao/web/action/sclerochronology/SamplingPlanAction-conversion.properties b/wao-web/src/main/resources/fr/ifremer/wao/web/action/sclerochronology/SamplingPlanAction-conversion.properties index 977bee2..5a31fb0 100644 --- a/wao-web/src/main/resources/fr/ifremer/wao/web/action/sclerochronology/SamplingPlanAction-conversion.properties +++ b/wao-web/src/main/resources/fr/ifremer/wao/web/action/sclerochronology/SamplingPlanAction-conversion.properties @@ -1 +1,21 @@ +### +# #%L +# Wao :: Web +# %% +# Copyright (C) 2009 - 2015 Ifremer +# %% +# 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 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/>. +# #L% +### filter=org.nuiton.web.struts2.converters.JsonConverter -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 d8bdca7f2122b97125c61927896fe168726b693f Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:05:50 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC1' with non-snapshot versions --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 03c6a12..d343301 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC1-SNAPSHOT</version> + <version>5.0-RC1</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 0132f05..d8aec2d 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC1-SNAPSHOT</version> + <version>5.0-RC1</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index ee22aa5..713d902 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC1-SNAPSHOT</version> + <version>5.0-RC1</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index d602444..00ae520 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC1-SNAPSHOT</version> + <version>5.0-RC1</version> </parent> <artifactId>wao-web</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 9f8ac825bdc505411111fcd31ed3cd60295a971b Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:08:55 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0c9d77b..07a9b1c 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC1</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 26c6ea3..d8aec2d 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC1</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 3d39d69..713d902 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC1</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index d54b842..00ae520 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC1</version> </parent> <artifactId>wao-web</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 72836a566ba576b1332488e6889f38a97682f1a8 Merge: 9f8ac82 8c8e421 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:08:56 2015 +0000 Merge branch 'master' into develop pom.xml | 2 +- .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 21 +++++++++++++++++++++ .../wao/entity/IndividualMeasurementStrategy.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/LaboratoryImpl.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/Organisations.java | 21 +++++++++++++++++++++ .../wao/entity/SclerochronologySamplingContext.java | 21 +++++++++++++++++++++ .../main/java/fr/ifremer/wao/entity/Specieses.java | 21 +++++++++++++++++++++ .../service/IllegalSampleReceptionException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleSizeException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleSubmissionException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleTreatmentException.java | 21 +++++++++++++++++++++ ...ssingIndividualMeasurementStrategyException.java | 21 +++++++++++++++++++++ .../service/MissingSampleReceptionException.java | 21 +++++++++++++++++++++ .../service/MissingSampleSizeException.java | 21 +++++++++++++++++++++ .../service/MissingSampleSubmissionException.java | 21 +++++++++++++++++++++ ...ingSclerochronologySamplingContextException.java | 21 +++++++++++++++++++++ .../services/service/MissingSpeciesException.java | 21 +++++++++++++++++++++ .../service/administration/LaboratoriesService.java | 21 +++++++++++++++++++++ .../administration/OrganisationsService.java | 21 +++++++++++++++++++++ .../service/administration/WaoUsersList.java | 21 +++++++++++++++++++++ .../services/service/csv/SpeciesImportModel.java | 21 +++++++++++++++++++++ .../csv/operations/SpeciesParserFormatter.java | 21 +++++++++++++++++++++ .../services/service/SclerochronologyFixtures.java | 21 +++++++++++++++++++++ .../SclerochronologySamplingPlanServiceTest.java | 21 +++++++++++++++++++++ .../ifremer/wao/services/service/WaoFixtures.java | 21 +++++++++++++++++++++ .../action/administration/ImportSpeciesAction.java | 21 +++++++++++++++++++++ .../SamplingPlanAction-conversion.properties | 20 ++++++++++++++++++++ 27 files changed, 546 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 238d604a61d25d1cc246e9580dc03b86261f7df3 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:08:56 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d343301..8da7a50 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC1</version> + <version>5.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index d8aec2d..26c6ea3 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC1</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 713d902..3d39d69 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC1</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 00ae520..d54b842 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC1</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm