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>.