branch develop updated (8b9e644 -> f370eeb)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 8b9e644 [jgitflow-maven-plugin]updating poms for 3.9-SNAPSHOT development new f424227 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 2f3b8a5 fix release new 32eaad0 [jgitflow-maven-plugin]updating poms for branch'release/3.8' with non-snapshot versions new f91779d Merge branch 'release/3.8' new d2cb759 Merge branch 'master' into develop new f370eeb [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 f370eebd5a6241c3f1c13f762185700194c4bece Author: Maven Release <maven-release@codelutin.com> Date: Sat Nov 8 15:02:26 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit d2cb759ef6d64342b78356e950de14eda786faf2 Merge: f424227 f91779d Author: Maven Release <maven-release@codelutin.com> Date: Sat Nov 8 15:02:26 2014 +0000 Merge branch 'master' into develop commit f424227eed45adde29e70655a1bc719c611f1348 Author: Maven Release <maven-release@codelutin.com> Date: Sat Nov 8 15:02:25 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit f91779d105b880791ae2c69af1a42357c1fbc8fa Merge: 27f1241 32eaad0 Author: Maven Release <maven-release@codelutin.com> Date: Sat Nov 8 15:02:23 2014 +0000 Merge branch 'release/3.8' commit 32eaad04c34a7e0eb1dc16a5cca2f8518a6e1457 Author: Maven Release <maven-release@codelutin.com> Date: Sat Nov 8 14:55:26 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.8' with non-snapshot versions commit 2f3b8a5bdf38a72f7d645f4faf457e20f6043a1b Author: Maven Release <maven-release@codelutin.com> Date: Sat Nov 8 14:55:09 2014 +0000 fix release Summary of changes: .../persistence/entities/referential/Persons.java | 24 ++++++++++++++++++++++ .../referential/TuttiReferentialEntities.java | 24 ++++++++++++++++++++++ .../persistence/entities/referential/Vessels.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceService.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/GearPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/GearPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/LocationPersistenceService.java | 24 ++++++++++++++++++++++ .../LocationPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/ObjectTypePersistenceService.java | 24 ++++++++++++++++++++++ .../ObjectTypePersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/PersonPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/PersonPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../ReferentialPersistenceServiceSupport.java | 24 ++++++++++++++++++++++ .../referential/SpeciesPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/SpeciesPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/VesselPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/VesselPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../GearPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../GearPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ .../LocationPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../ObjectTypePersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../PersonPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../PersonPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ ...ferentialPersistenceServiceReadTestSupport.java | 24 ++++++++++++++++++++++ ...erentialPersistenceServiceWriteTestSupport.java | 24 ++++++++++++++++++++++ .../SpeciesPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../SpeciesPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ .../VesselPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../VesselPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/referential/GearRow.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/PersonRow.java | 24 ++++++++++++++++++++++ .../referential/ReferentialImportResult.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/SpeciesRow.java | 24 ++++++++++++++++++++++ .../TemporaryReferentialEntityIdParser.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/VesselRow.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../frequency/BenthosFrequencyLogRowModel.java | 24 ++++++++++++++++++++++ .../frequency/SpeciesFrequencyLogRowModel.java | 24 ++++++++++++++++++++++ .../ManageTemporaryReferentialUIModel.java | 24 ++++++++++++++++++++++ 41 files changed, 983 insertions(+) -- 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 tutti. See http://git.codelutin.com/tutti.git commit 2f3b8a5bdf38a72f7d645f4faf457e20f6043a1b Author: Maven Release <maven-release@codelutin.com> Date: Sat Nov 8 14:55:09 2014 +0000 fix release --- .../persistence/entities/referential/Persons.java | 24 ++++++++++++++++++++++ .../referential/TuttiReferentialEntities.java | 24 ++++++++++++++++++++++ .../persistence/entities/referential/Vessels.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceService.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/GearPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/GearPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/LocationPersistenceService.java | 24 ++++++++++++++++++++++ .../LocationPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/ObjectTypePersistenceService.java | 24 ++++++++++++++++++++++ .../ObjectTypePersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/PersonPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/PersonPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../ReferentialPersistenceServiceSupport.java | 24 ++++++++++++++++++++++ .../referential/SpeciesPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/SpeciesPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/VesselPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/VesselPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../GearPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../GearPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ .../LocationPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../ObjectTypePersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../PersonPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../PersonPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ ...ferentialPersistenceServiceReadTestSupport.java | 24 ++++++++++++++++++++++ ...erentialPersistenceServiceWriteTestSupport.java | 24 ++++++++++++++++++++++ .../SpeciesPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../SpeciesPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ .../VesselPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../VesselPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/referential/GearRow.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/PersonRow.java | 24 ++++++++++++++++++++++ .../referential/ReferentialImportResult.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/SpeciesRow.java | 24 ++++++++++++++++++++++ .../TemporaryReferentialEntityIdParser.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/VesselRow.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../frequency/BenthosFrequencyLogRowModel.java | 24 ++++++++++++++++++++++ .../frequency/SpeciesFrequencyLogRowModel.java | 24 ++++++++++++++++++++++ .../ManageTemporaryReferentialUIModel.java | 24 ++++++++++++++++++++++ 41 files changed, 983 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java index a8160da..b25ae47 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Persons.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import com.google.common.base.Predicate; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiReferentialEntities.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiReferentialEntities.java index d6cdd47..f3b31cc 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiReferentialEntities.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiReferentialEntities.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import fr.ifremer.adagio.core.dao.referential.StatusCode; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Vessels.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Vessels.java index dbe5b0d..86276ef 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Vessels.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/Vessels.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import fr.ifremer.adagio.core.dao.technical.hibernate.TemporaryDataHelper; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceService.java index f9daae2..f335bca 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Predicate; import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java index 722a9f2..824c271 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceImpl.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceService.java index b1db9f0..2c052c8 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; import fr.ifremer.tutti.persistence.entities.referential.Gear; import org.springframework.cache.annotation.CacheEvict; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java index b37d9c0..98e8f2d 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceImpl.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.adagio.core.dao.referential.StatusCode; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceService.java index b40c5b5..ddf5289 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.Program; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceImpl.java index 3c436c5..67301db 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceImpl.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.adagio.core.dao.referential.location.LocationClassificationId; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceService.java index ca05c6f..bcaa297 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; import fr.ifremer.tutti.persistence.entities.referential.ObjectType; import org.springframework.cache.annotation.Cacheable; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceServiceImpl.java index 8ca962d..91d264b 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceServiceImpl.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.ObjectType; import fr.ifremer.tutti.persistence.entities.referential.ObjectTypes; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceService.java index 863e748..f121654 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; import fr.ifremer.tutti.persistence.entities.referential.Person; import org.springframework.cache.annotation.CacheEvict; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java index a9ee7f9..7fa213f 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceImpl.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.adagio.core.dao.administration.user.DepartmentId; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java index 93ec432..c5d0727 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.adagio.core.dao.referential.StatusCode; import fr.ifremer.adagio.core.dao.referential.StatusDao; import fr.ifremer.adagio.core.service.technical.CacheService; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceService.java index d3663ca..56f31c9 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; import fr.ifremer.tutti.persistence.entities.referential.Species; import org.springframework.cache.annotation.CacheEvict; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java index cf50b7f..fbe6d8a 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceImpl.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.adagio.core.dao.referential.taxon.TaxonName; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceService.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceService.java index 5f2b4db..a29a8a9 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceService.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.TuttiPersistenceServiceImplementor; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.referential.Vessel; diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java index c1fcf5f..ddf2b58 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceImpl.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import fr.ifremer.adagio.core.dao.data.vessel.VesselExtendDao; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceReadTest.java index a85265d..92769ec 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/CaracteristicPersistenceServiceReadTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Caracteristics; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceReadTest.java index 920db65..d8b62fa 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceReadTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; import org.apache.commons.logging.Log; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceWriteTest.java index ac22a46..2968a27 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/GearPersistenceServiceWriteTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Gears; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceReadTest.java index e57e683..fc37aa2 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/LocationPersistenceServiceReadTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.referential.TuttiLocation; import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; import org.junit.Before; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceServiceReadTest.java index ae29732..67b3306 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ObjectTypePersistenceServiceReadTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.referential.ObjectType; import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; import org.junit.Assert; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceReadTest.java index d8420e1..2a19f57 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceReadTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; import org.junit.Before; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceWriteTest.java index 0f1550c..175d33f 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/PersonPersistenceServiceWriteTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.Persons; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceReadTestSupport.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceReadTestSupport.java index b26bee1..575c6fc 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceReadTestSupport.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceReadTestSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.adagio.core.service.technical.CacheService; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.TuttiEntity; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceWriteTestSupport.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceWriteTestSupport.java index 0da0328..70e86e2 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceWriteTestSupport.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/ReferentialPersistenceServiceWriteTestSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.test.DatabaseResource; import org.junit.ClassRule; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceReadTest.java index 96aedff..bf2f0e8 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceReadTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Speciess; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceWriteTest.java index b829060..b42ebc1 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/SpeciesPersistenceServiceWriteTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Speciess; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceReadTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceReadTest.java index eeb256e..fd6755a 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceReadTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceReadTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; import org.apache.commons.logging.Log; diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceWriteTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceWriteTest.java index e3215d8..087b6ad 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceWriteTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/referential/VesselPersistenceServiceWriteTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.service.referential; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Vessels; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearRow.java index 1c35d5d..5bce4f6 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/GearRow.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.referential; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.GearBean; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonRow.java index 8bc69e4..3a0b108 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/PersonRow.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.referential; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Person; import fr.ifremer.tutti.persistence.entities.referential.PersonBean; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportResult.java index 6b5ae09..0414bc6 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialImportResult.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.referential; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.persistence.entities.TuttiEntity; import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesRow.java index 7d31e56..f6ed807 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/SpeciesRow.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.referential; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.SpeciesBean; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TemporaryReferentialEntityIdParser.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TemporaryReferentialEntityIdParser.java index 4216ddb..bd56488 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TemporaryReferentialEntityIdParser.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/TemporaryReferentialEntityIdParser.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.referential; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.lang3.StringUtils; import org.nuiton.csv.ValueParser; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselRow.java index 7210e95..0863607 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/VesselRow.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.referential; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.base.Preconditions; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.VesselBean; diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index 960983d..1a853d5 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@ -1,3 +1,26 @@ +### +# #%L +# Tutti :: UI +# $Id:$ +# $HeadURL:$ +# %% +# Copyright (C) 2012 - 2014 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU 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 General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo #Thu Oct 23 12:12:24 CEST 2014 tutti.config.help=config.html diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogRowModel.java index b2ba620..ed70446 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyLogRowModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.lang3.time.DateFormatUtils; import org.jdesktop.beans.AbstractSerializableBean; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogRowModel.java index f620239..6bee10c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyLogRowModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.commons.lang3.time.DateFormatUtils; import org.jdesktop.beans.AbstractBean; import org.jdesktop.beans.AbstractSerializableBean; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIModel.java index 2346cb0..393fe54 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUIModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.referential; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU 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 General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.jdesktop.beans.AbstractSerializableBean; /** -- 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 tutti. See http://git.codelutin.com/tutti.git commit 32eaad04c34a7e0eb1dc16a5cca2f8518a6e1457 Author: Maven Release <maven-release@codelutin.com> Date: Sat Nov 8 14:55:26 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.8' with non-snapshot versions --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 0b4dda2..4bc5d05 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.8</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 599d56f..195194b 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.8</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 21e61cb..518d7fb 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.8</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 3724bf6..d2d8c42 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.8</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 4a3cd59..e1bde24 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.8</version> </parent> <groupId>fr.ifremer.tutti</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 tutti. See http://git.codelutin.com/tutti.git commit f91779d105b880791ae2c69af1a42357c1fbc8fa Merge: 27f1241 32eaad0 Author: Maven Release <maven-release@codelutin.com> Date: Sat Nov 8 15:02:23 2014 +0000 Merge branch 'release/3.8' pom.xml | 18 +- .../AllegroCampagne-Specifications.odt | Bin 703314 -> 776831 bytes .../AllegroCampagne-Specifications.pdf | Bin 1287715 -> 1400148 bytes tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../tutti/persistence/TuttiPersistence.java | 16 +- .../tutti/persistence/TuttiPersistenceImpl.java | 366 +++++++--- .../persistence/TuttiPersistenceNoDbImpl.java | 78 ++- .../entities/data/SpeciesAbleBatchs.java | 31 + .../persistence/entities/data/SpeciesBatchs.java | 1 - .../persistence/entities/referential/Gears.java | 24 + .../referential/{Gears.java => Persons.java} | 30 +- .../persistence/entities/referential/Speciess.java | 25 + .../{Gears.java => TuttiReferentialEntities.java} | 30 +- .../referential/{Gears.java => Vessels.java} | 35 +- .../AccidentalBatchPersistenceServiceImpl.java | 32 +- .../service/AttachmentPersistenceServiceImpl.java | 6 +- .../BenthosBatchPersistenceServiceImpl.java | 162 +++-- .../service/CatchBatchPersistenceServiceImpl.java | 56 +- .../service/CruisePersistenceServiceImpl.java | 37 +- .../FishingOperationPersistenceServiceImpl.java | 45 +- ...dualObservationBatchPersistenceServiceImpl.java | 21 +- .../MarineLitterBatchPersistenceServiceImpl.java | 9 +- .../service/ProgramPersistenceServiceImpl.java | 3 - .../service/ReferentialPersistenceService.java | 145 +++- .../service/ReferentialPersistenceServiceImpl.java | 291 +++++++- .../SpeciesBatchPersistenceServiceImpl.java | 220 +++--- .../service/TechnicalPersistenceService.java | 3 + .../service/TechnicalPersistenceServiceImpl.java | 15 + .../service/TuttiPersistenceServiceLocator.java | 48 +- .../CaracteristicPersistenceService.java | 107 +++ .../CaracteristicPersistenceServiceImpl.java | 323 +++++++++ .../referential/GearPersistenceService.java | 102 +++ .../referential/GearPersistenceServiceImpl.java | 231 ++++++ .../referential/LocationPersistenceService.java | 134 ++++ .../LocationPersistenceServiceImpl.java | 228 ++++++ .../ObjectTypePersistenceService.java} | 49 +- .../ObjectTypePersistenceServiceImpl.java | 78 +++ .../referential/PersonPersistenceService.java | 104 +++ .../referential/PersonPersistenceServiceImpl.java | 231 ++++++ .../ReferentialPersistenceServiceSupport.java | 80 +++ .../referential/SpeciesPersistenceService.java | 141 ++++ .../referential/SpeciesPersistenceServiceImpl.java | 288 ++++++++ .../referential/VesselPersistenceService.java | 125 ++++ .../referential/VesselPersistenceServiceImpl.java | 343 +++++++++ .../service/util/BatchPersistenceHelper.java | 129 +++- .../service/util/MeasurementPersistenceHelper.java | 22 +- .../service/util/SamplePersistenceHelper.java | 8 +- .../tutti/persistence/test/DatabaseFixtures.java | 40 +- .../src/main/resources/queries-failsafe.hbm.xml | 153 ++++ .../resources/tutti-db-enumerations.properties | 10 - .../src/main/xmi/tutti-persistence.zargo | Bin 56700 -> 56767 bytes ...AccidentalBatchPersistenceServiceWriteTest.java | 23 +- .../BenthosBatchPersistenceServiceWriteTest.java | 25 +- .../CatchBatchPersistenceServiceWriteTest.java | 3 - .../service/CruisePersistenceServiceWriteTest.java | 27 +- ...ishingOperationPersistenceServiceWriteTest.java | 21 +- ...bservationBatchPersistenceServiceWriteTest.java | 22 +- ...rineLitterBatchPersistenceServiceWriteTest.java | 12 +- .../ProgramPersistenceServiceWriteTest.java | 7 +- .../ReferentialPersistenceServiceReadTest.java | 366 ---------- .../ReferentialPersistenceServiceWriteTest.java | 242 ------- .../SpeciesBatchPersistenceServiceWriteTest.java | 19 +- .../CaracteristicPersistenceServiceReadTest.java | 118 ++++ .../GearPersistenceServiceReadTest.java | 61 ++ .../GearPersistenceServiceWriteTest.java | 104 +++ .../LocationPersistenceServiceReadTest.java | 101 +++ .../ObjectTypePersistenceServiceReadTest.java | 57 ++ .../PersonPersistenceServiceReadTest.java} | 34 +- .../PersonPersistenceServiceWriteTest.java | 111 +++ ...ferentialPersistenceServiceReadTestSupport.java | 88 +++ ...rentialPersistenceServiceWriteTestSupport.java} | 25 +- .../SpeciesPersistenceServiceReadTest.java | 99 +++ .../SpeciesPersistenceServiceWriteTest.java | 105 +++ .../VesselPersistenceServiceReadTest.java | 82 +++ .../VesselPersistenceServiceWriteTest.java | 107 +++ tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 143 +++- .../catches/WeightComputingService.java.orig | 778 --------------------- .../tutti/service/referential/GearModel.java | 27 +- .../ifremer/tutti/service/referential/GearRow.java | 61 ++ .../tutti/service/referential/PersonModel.java | 24 +- .../{PersonModel.java => PersonRow.java} | 46 +- .../referential/ReferentialExportService.java | 375 ++++++++++ .../ReferentialImportExportService.java | 444 ------------ .../referential/ReferentialImportResult.java | 91 +++ .../referential/ReferentialImportService.java | 764 ++++++++++++++++++++ .../tutti/service/referential/SpeciesModel.java | 23 +- .../{SpeciesModel.java => SpeciesRow.java} | 47 +- .../TemporaryReferentialEntityIdParser.java | 60 ++ .../tutti/service/referential/VesselModel.java | 47 +- .../tutti/service/referential/VesselRow.java | 62 ++ .../resources/i18n/tutti-service_en_GB.properties | 24 + .../resources/i18n/tutti-service_fr_FR.properties | 28 +- .../tutti/service/PersistenceServiceTest.java | 20 +- .../referential/ReferentialExportServiceTest.java | 139 ++++ .../ReferentialImportExportServiceTest.java | 285 -------- .../referential/ReferentialImportServiceTest.java | 464 ++++++++++++ tutti-service/src/test/resources/log4j.properties | 3 + tutti-ui-swing/pom.xml | 7 +- .../filtered-resources/tutti-help-fr.properties | 6 +- tutti-ui-swing/src/main/help/en/config.html | 1 + tutti-ui-swing/src/main/help/fr/config.html | 1 + .../src/main/help/fr/editFishingOperation.html | 6 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 11 +- .../AbstractOpenReplaceTemporaryUIAction.java | 14 +- .../action/AbstractReplaceTemporaryUIAction.java | 32 +- ...java => ExportExistingTemporaryGearAction.java} | 27 +- ...va => ExportExistingTemporaryPersonAction.java} | 28 +- ...a => ExportExistingTemporarySpeciesAction.java} | 28 +- ...va => ExportExistingTemporaryVesselAction.java} | 28 +- .../action/ExportTemporaryGearExampleAction.java | 8 +- .../action/ExportTemporaryPersonExampleAction.java | 10 +- .../ExportTemporarySpeciesExampleAction.java | 10 +- .../action/ExportTemporaryVesselExampleAction.java | 10 +- .../ui/swing/action/ImportTemporaryGearAction.java | 24 +- .../swing/action/ImportTemporaryPersonAction.java | 26 +- .../swing/action/ImportTemporarySpeciesAction.java | 26 +- .../swing/action/ImportTemporaryVesselAction.java | 26 +- .../ui/swing/action/NewFishingOperationAction.java | 7 +- .../action/OpenReplaceTemporaryGearUIAction.java | 16 + .../action/OpenReplaceTemporaryPersonUIAction.java | 15 + .../OpenReplaceTemporarySpeciesUIAction.java | 16 + .../action/OpenReplaceTemporaryVesselUIAction.java | 16 + .../swing/action/ReplaceTemporaryGearAction.java | 15 +- .../swing/action/ReplaceTemporaryPersonAction.java | 15 +- .../action/ReplaceTemporarySpeciesAction.java | 14 +- .../swing/action/ReplaceTemporaryVesselAction.java | 14 +- .../swing/content/cruise/EditCruiseUIHandler.java | 2 +- .../swing/content/home/SelectCruiseUIHandler.java | 11 +- .../catches/benthos/BenthosBatchRowModel.java | 3 +- .../BenthosFrequencyLogCellComponent.java | 170 +++++ .../frequency/BenthosFrequencyLogRowModel.java | 67 ++ .../frequency/BenthosFrequencyLogsTableModel.java | 58 ++ .../frequency/BenthosFrequencyTableModel.java | 9 +- .../benthos/frequency/BenthosFrequencyUI.css | 20 + .../benthos/frequency/BenthosFrequencyUI.jaxx | 18 +- .../frequency/BenthosFrequencyUIHandler.java | 162 ++++- .../catches/species/SpeciesBatchRowModel.java | 2 +- .../SpeciesFrequencyLogCellComponent.java | 172 +++++ .../frequency/SpeciesFrequencyLogRowModel.java | 69 ++ .../frequency/SpeciesFrequencyLogsTableModel.java | 65 ++ .../frequency/SpeciesFrequencyTableModel.java | 11 +- .../species/frequency/SpeciesFrequencyUI.css | 20 + .../species/frequency/SpeciesFrequencyUI.jaxx | 18 +- .../frequency/SpeciesFrequencyUIHandler.java | 178 ++++- .../referential/ManageTemporaryReferentialUI.css | 76 +- .../referential/ManageTemporaryReferentialUI.jaxx | 60 +- .../ManageTemporaryReferentialUIHandler.java | 147 +++- .../ManageTemporaryReferentialUIModel.java | 92 +++ .../replace/AbstractReplaceTemporaryUI.css | 7 + .../replace/AbstractReplaceTemporaryUI.jaxx | 7 + .../replace/AbstractReplaceTemporaryUIModel.java | 13 + .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 13 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 46 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 83 ++- .../src/main/resources/icons/action-delete.png | Bin 715 -> 949 bytes tutti-ui-swing/src/main/resources/test.shp | Bin 0 -> 448188 bytes 158 files changed, 9451 insertions(+), 3098 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 tutti. See http://git.codelutin.com/tutti.git commit f424227eed45adde29e70655a1bc719c611f1348 Author: Maven Release <maven-release@codelutin.com> Date: Sat Nov 8 15:02:25 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 5640296..4bc5d05 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.9-SNAPSHOT</version> + <version>3.8</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 2368234..195194b 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.9-SNAPSHOT</version> + <version>3.8</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index f0d8896..518d7fb 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.9-SNAPSHOT</version> + <version>3.8</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index e25d431..d2d8c42 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.9-SNAPSHOT</version> + <version>3.8</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 6d53bc1..e1bde24 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.9-SNAPSHOT</version> + <version>3.8</version> </parent> <groupId>fr.ifremer.tutti</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 tutti. See http://git.codelutin.com/tutti.git commit d2cb759ef6d64342b78356e950de14eda786faf2 Merge: f424227 f91779d Author: Maven Release <maven-release@codelutin.com> Date: Sat Nov 8 15:02:26 2014 +0000 Merge branch 'master' into develop .../persistence/entities/referential/Persons.java | 24 ++++++++++++++++++++++ .../referential/TuttiReferentialEntities.java | 24 ++++++++++++++++++++++ .../persistence/entities/referential/Vessels.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceService.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/GearPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/GearPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/LocationPersistenceService.java | 24 ++++++++++++++++++++++ .../LocationPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/ObjectTypePersistenceService.java | 24 ++++++++++++++++++++++ .../ObjectTypePersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/PersonPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/PersonPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../ReferentialPersistenceServiceSupport.java | 24 ++++++++++++++++++++++ .../referential/SpeciesPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/SpeciesPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../referential/VesselPersistenceService.java | 24 ++++++++++++++++++++++ .../referential/VesselPersistenceServiceImpl.java | 24 ++++++++++++++++++++++ .../CaracteristicPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../GearPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../GearPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ .../LocationPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../ObjectTypePersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../PersonPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../PersonPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ ...ferentialPersistenceServiceReadTestSupport.java | 24 ++++++++++++++++++++++ ...erentialPersistenceServiceWriteTestSupport.java | 24 ++++++++++++++++++++++ .../SpeciesPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../SpeciesPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ .../VesselPersistenceServiceReadTest.java | 24 ++++++++++++++++++++++ .../VesselPersistenceServiceWriteTest.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/referential/GearRow.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/PersonRow.java | 24 ++++++++++++++++++++++ .../referential/ReferentialImportResult.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/SpeciesRow.java | 24 ++++++++++++++++++++++ .../TemporaryReferentialEntityIdParser.java | 24 ++++++++++++++++++++++ .../tutti/service/referential/VesselRow.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../frequency/BenthosFrequencyLogRowModel.java | 24 ++++++++++++++++++++++ .../frequency/SpeciesFrequencyLogRowModel.java | 24 ++++++++++++++++++++++ .../ManageTemporaryReferentialUIModel.java | 24 ++++++++++++++++++++++ 41 files changed, 983 insertions(+) -- 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 tutti. See http://git.codelutin.com/tutti.git commit f370eebd5a6241c3f1c13f762185700194c4bece Author: Maven Release <maven-release@codelutin.com> Date: Sat Nov 8 15:02:26 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 4bc5d05..5640296 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8</version> + <version>3.9-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 195194b..2368234 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8</version> + <version>3.9-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 518d7fb..f0d8896 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8</version> + <version>3.9-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index d2d8c42..e25d431 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8</version> + <version>3.9-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index e1bde24..6d53bc1 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8</version> + <version>3.9-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm