branch develop updated (b040e4c -> a150129)
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 b040e4c [jgitflow-maven-plugin]updating poms for 3.10-SNAPSHOT development new d0605b8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new e882951 add license headers + optimize third parties new 882cc71 [jgitflow-maven-plugin]updating poms for branch'release/3.9' with non-snapshot versions new bc41c04 Merge branch 'release/3.9' new f2ba60e Merge branch 'master' into develop new a150129 [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 a150129a203dacbcb444c19c078935c0d16dbd65 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:45:52 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit f2ba60e533b4a496dcf90dfc78f4e85bfeec67e5 Merge: d0605b8 bc41c04 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:45:52 2014 +0000 Merge branch 'master' into develop commit d0605b87f66ca708a22afd70a30631f3f11ddc07 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:45:51 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit bc41c04c3be8c6983ebe0235b82992c61f3cbf00 Merge: f91779d 882cc71 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:45:48 2014 +0000 Merge branch 'release/3.9' commit 882cc71788aa1d27246ef393288d614b774fc947 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:41:20 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.9' with non-snapshot versions commit e882951c5bb1a3b592a1c780dbe26aa94919be25 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:40:44 2014 +0000 add license headers + optimize third parties Summary of changes: .../src/license/THIRD-PARTY.properties | 4 ++-- tutti-service/src/license/THIRD-PARTY.properties | 6 +++--- .../ifremer/tutti/service/PdfGeneratorService.java | 24 ++++++++++++++++++++++ .../service/catches/multipost/CatchBatchRow.java | 24 ++++++++++++++++++++++ .../catches/multipost/CatchBatchRowModel.java | 24 ++++++++++++++++++++++ .../catches/multipost/MultiPostConstants.java | 24 ++++++++++++++++++++++ .../fr/ifremer/tutti/service/pupitri/BoxType.java | 24 ++++++++++++++++++++++ .../pupitri/CarrouselImportRequestResult.java | 24 ++++++++++++++++++++++ .../service/pupitri/PupitriExportService.java | 24 ++++++++++++++++++++++ .../tutti/service/pupitri/PupitriSignContext.java | 24 ++++++++++++++++++++++ .../pupitri/report/PupitriImportReportModel.java | 24 ++++++++++++++++++++++ .../pupitri/report/PupitriImportReportRow.java | 24 ++++++++++++++++++++++ .../service/referential/ImportRequestResult.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryGearService.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryPersonService.java | 24 ++++++++++++++++++++++ .../ReferentialTemporarySpeciesService.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryVesselService.java | 24 ++++++++++++++++++++++ .../pupitri/PupitriImportServiceEvo6149Test.java | 24 ++++++++++++++++++++++ .../pupitri/PupitryImportServiceTestSupport.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryGearServiceTest.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryPersonServiceTest.java | 24 ++++++++++++++++++++++ .../ReferentialTemporarySpeciesServiceTest.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryVesselServiceTest.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../swing/action/ExportMultiPostCatchAction.java | 24 ++++++++++++++++++++++ .../swing/action/ImportMultiPostCatchAction.java | 24 ++++++++++++++++++++++ 26 files changed, 580 insertions(+), 5 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 e882951c5bb1a3b592a1c780dbe26aa94919be25 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:40:44 2014 +0000 add license headers + optimize third parties --- .../src/license/THIRD-PARTY.properties | 4 ++-- tutti-service/src/license/THIRD-PARTY.properties | 6 +++--- .../ifremer/tutti/service/PdfGeneratorService.java | 24 ++++++++++++++++++++++ .../service/catches/multipost/CatchBatchRow.java | 24 ++++++++++++++++++++++ .../catches/multipost/CatchBatchRowModel.java | 24 ++++++++++++++++++++++ .../catches/multipost/MultiPostConstants.java | 24 ++++++++++++++++++++++ .../fr/ifremer/tutti/service/pupitri/BoxType.java | 24 ++++++++++++++++++++++ .../pupitri/CarrouselImportRequestResult.java | 24 ++++++++++++++++++++++ .../service/pupitri/PupitriExportService.java | 24 ++++++++++++++++++++++ .../tutti/service/pupitri/PupitriSignContext.java | 24 ++++++++++++++++++++++ .../pupitri/report/PupitriImportReportModel.java | 24 ++++++++++++++++++++++ .../pupitri/report/PupitriImportReportRow.java | 24 ++++++++++++++++++++++ .../service/referential/ImportRequestResult.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryGearService.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryPersonService.java | 24 ++++++++++++++++++++++ .../ReferentialTemporarySpeciesService.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryVesselService.java | 24 ++++++++++++++++++++++ .../pupitri/PupitriImportServiceEvo6149Test.java | 24 ++++++++++++++++++++++ .../pupitri/PupitryImportServiceTestSupport.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryGearServiceTest.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryPersonServiceTest.java | 24 ++++++++++++++++++++++ .../ReferentialTemporarySpeciesServiceTest.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryVesselServiceTest.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../swing/action/ExportMultiPostCatchAction.java | 24 ++++++++++++++++++++++ .../swing/action/ImportMultiPostCatchAction.java | 24 ++++++++++++++++++++++ 26 files changed, 580 insertions(+), 5 deletions(-) diff --git a/tutti-persistence/src/license/THIRD-PARTY.properties b/tutti-persistence/src/license/THIRD-PARTY.properties index 928ad18..a84f087 100644 --- a/tutti-persistence/src/license/THIRD-PARTY.properties +++ b/tutti-persistence/src/license/THIRD-PARTY.properties @@ -13,7 +13,6 @@ # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - HSQLDB License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 @@ -29,6 +28,7 @@ # Please fill the missing licenses for dependencies : # # -#Fri May 30 09:52:42 CEST 2014 +#Tue Nov 25 11:33:00 UTC 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +hsqldb--hsqldb--1.8.1.3=BSD License diff --git a/tutti-service/src/license/THIRD-PARTY.properties b/tutti-service/src/license/THIRD-PARTY.properties index 18788b6..1ff5077 100644 --- a/tutti-service/src/license/THIRD-PARTY.properties +++ b/tutti-service/src/license/THIRD-PARTY.properties @@ -3,11 +3,11 @@ # Already used licenses in project : # - AL 2.0 # - Affero General Public License (AGPL) +# - Apache 2 # - Apache License 2.0 # - Apache License Version 2.0 # - Apache License, version 2.0 # - BSD License -# - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License # - Common Public License Version 1.0 @@ -19,7 +19,6 @@ # - GNU Lesser General Public License (LGPL), version 2.1 # - GNU Library or Lesser General Public License # - General Public License (GPL) -# - HSQLDB License # - ICU License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Java HTML Tidy License @@ -39,7 +38,7 @@ # Please fill the missing licenses for dependencies : # # -#Fri May 30 09:52:42 CEST 2014 +#Tue Nov 25 11:36:15 UTC 2014 batik--batik-awt-util--1.6=The Apache Software License, Version 2.0 batik--batik-bridge--1.6=The Apache Software License, Version 2.0 batik--batik-css--1.6=The Apache Software License, Version 2.0 @@ -55,3 +54,4 @@ batik--batik-util--1.6=The Apache Software License, Version 2.0 batik--batik-xml--1.6=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +hsqldb--hsqldb--1.8.1.3=BSD License diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorService.java index c88c869..67e6207 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service; +/* + * #%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.itextpdf.text.PageSize; import freemarker.cache.ClassTemplateLoader; import freemarker.ext.beans.BeansWrapper; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchBatchRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchBatchRow.java index b0b9740..a092722 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchBatchRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchBatchRow.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%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% + */ + /** * Created on 11/15/14. * diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchBatchRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchBatchRowModel.java index 786e090..c8f4e00 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchBatchRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchBatchRowModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%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.service.TuttiCsvUtil; /** diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostConstants.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostConstants.java index 60b41e3..b50b5fd 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostConstants.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostConstants.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.catches.multipost; +/* + * #%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% + */ + /** * Created on 11/16/14. * diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/BoxType.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/BoxType.java index c3dd556..98861b4 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/BoxType.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/BoxType.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.pupitri; +/* + * #%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% + */ + /** * Created on 11/22/14. * diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselImportRequestResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselImportRequestResult.java index 025f6f3..364bd4d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselImportRequestResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselImportRequestResult.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.pupitri; +/* + * #%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.collect.ListMultimap; import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Species; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriExportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriExportService.java index 1c3bc19..5ca1d37 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriExportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriExportService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.pupitri; +/* + * #%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.Charsets; import com.google.common.base.Function; import com.google.common.collect.Lists; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSignContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSignContext.java index 6ea15a5..d6bafe2 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSignContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSignContext.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.pupitri; +/* + * #%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 java.io.Serializable; /** diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java index afcbaf3..5c862aa 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.pupitri.report; +/* + * #%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.Function; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Ordering; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportRow.java index bb74bfa..6bc8a79 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportRow.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.pupitri.report; +/* + * #%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.service.pupitri.PupitriSignContext; /** diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ImportRequestResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ImportRequestResult.java index d377b2c..6fc0b11 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ImportRequestResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ImportRequestResult.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.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java index 3605563..97a7420 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.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.Charsets; import com.google.common.base.Function; import com.google.common.collect.Lists; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java index 717b9ff..9a9f6b9 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.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.Charsets; import com.google.common.base.Function; import com.google.common.collect.Lists; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java index 5f65c2c..164848d 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.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.Charsets; import com.google.common.base.Function; import com.google.common.collect.Lists; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java index 7fb5eb9..2a44997 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.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.Charsets; import com.google.common.base.Function; import com.google.common.collect.Lists; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java index 99cf2bb..1daae43 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.pupitri; +/* + * #%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.Predicate; import com.google.common.collect.Sets; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitryImportServiceTestSupport.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitryImportServiceTestSupport.java index 3877a6f..3aab8db 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitryImportServiceTestSupport.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitryImportServiceTestSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.pupitri; +/* + * #%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.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.service.ServiceDbResource; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearServiceTest.java index 7084ceb..c1fa557 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearServiceTest.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.Charsets; import com.google.common.io.Files; import fr.ifremer.tutti.persistence.entities.referential.Gear; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonServiceTest.java index 37c15c3..6ef62b3 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonServiceTest.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.Charsets; import com.google.common.io.Files; import fr.ifremer.tutti.persistence.entities.referential.Person; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesServiceTest.java index 4a244ef..7ae100d 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesServiceTest.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.Charsets; import com.google.common.io.Files; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselServiceTest.java index 91da354..e3770c3 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselServiceTest.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.Charsets; import com.google.common.io.Files; import fr.ifremer.tutti.persistence.entities.referential.Vessel; 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 ec3237d..f14baa3 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 #Sat Nov 15 23:48:54 CET 2014 tutti.config.help=config.html diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostCatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostCatchAction.java index b9a69ac..9712f94 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostCatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostCatchAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.action; +/* + * #%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 fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.catches.multipost.MultiPostExportService; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostCatchAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostCatchAction.java index ee2f105..b5fa97f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostCatchAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostCatchAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.action; +/* + * #%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 fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.catches.multipost.MultiPostImportService; -- 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 882cc71788aa1d27246ef393288d614b774fc947 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:41:20 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.9' 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 932b6f3..f96eded 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.9</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 2368234..49ad7e7 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.9</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index f0d8896..a4e694f 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.9</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index e25d431..774a076 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.9</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 6d53bc1..d4a1ef3 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.9</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 bc41c04c3be8c6983ebe0235b82992c61f3cbf00 Merge: f91779d 882cc71 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:45:48 2014 +0000 Merge branch 'release/3.9' pom.xml | 27 +- src/site/rst/update.rst.vm | 4 +- src/site/site_fr.xml | 6 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 4 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 16 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 + .../tutti/persistence/TuttiPersistenceImpl.java | 80 +- .../persistence/TuttiPersistenceNoDbImpl.java | 26 +- .../tutti/persistence/entities/TuttiEntities.java | 12 +- .../entities/protocol/TuttiProtocols.java | 49 +- .../persistence/entities/referential/Gears.java | 8 + .../persistence/entities/referential/Persons.java | 11 + .../persistence/entities/referential/Speciess.java | 7 + .../persistence/entities/referential/Vessels.java | 8 + .../service/CatchBatchPersistenceServiceImpl.java | 10 +- .../referential/GearPersistenceService.java | 12 +- .../referential/GearPersistenceServiceImpl.java | 10 +- .../referential/PersonPersistenceService.java | 8 +- .../referential/PersonPersistenceServiceImpl.java | 10 +- .../referential/SpeciesPersistenceService.java | 22 +- .../referential/SpeciesPersistenceServiceImpl.java | 34 +- .../referential/VesselPersistenceService.java | 12 +- .../referential/VesselPersistenceServiceImpl.java | 10 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 24 + .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../GearPersistenceServiceWriteTest.java | 8 +- .../PersonPersistenceServiceWriteTest.java | 8 +- .../SpeciesPersistenceServiceWriteTest.java | 8 +- .../VesselPersistenceServiceWriteTest.java | 8 +- tutti-service/pom.xml | 2 +- tutti-service/src/license/THIRD-PARTY.properties | 6 +- .../ifremer/tutti/service/PdfGeneratorService.java | 108 +++ .../ifremer/tutti/service/PersistenceService.java | 64 +- .../service/catches/multipost/CatchBatchRow.java | 94 +++ .../catches/multipost/CatchBatchRowModel.java | 52 ++ .../catches/multipost/MultiPostConstants.java | 58 ++ .../catches/multipost/MultiPostExportService.java | 81 +- .../catches/multipost/MultiPostImportService.java | 194 ++++- .../export/pdf/CatchesPdfExportService.java | 90 +-- .../pupitri/{SpeciesRowModel.java => BoxType.java} | 39 +- .../pupitri/CarrouselImportRequestResult.java | 145 ++++ .../tutti/service/pupitri/PupitriCatch.java | 143 ---- .../service/pupitri/PupitriExportService.java | 84 +++ .../tutti/service/pupitri/PupitriImportResult.java | 295 +++++--- ...xportService.java => PupitriImportService.java} | 458 ++++++------ .../tutti/service/pupitri/PupitriSignContext.java | 89 +++ .../service/pupitri/PupitriSpeciesContext.java | 285 +++++++ .../service/pupitri/{ => csv}/CarrouselRow.java | 14 +- .../pupitri/{ => csv}/CarrouselRowModel.java | 23 +- .../service/pupitri/{ => csv}/SpeciesRow.java | 2 +- .../service/pupitri/{ => csv}/SpeciesRowModel.java | 2 +- .../tutti/service/pupitri/{ => csv}/TrunkRow.java | 3 +- .../service/pupitri/{ => csv}/TrunkRowModel.java | 3 +- .../pupitri/report/PupitriImportReportModel.java | 150 ++++ .../pupitri/report/PupitriImportReportRow.java | 108 +++ .../tutti/service/referential/GearModel.java | 6 - .../ifremer/tutti/service/referential/GearRow.java | 71 +- .../service/referential/ImportRequestResult.java | 111 +++ .../tutti/service/referential/PersonModel.java | 5 - .../tutti/service/referential/PersonRow.java | 58 +- .../referential/ReferentialExportService.java | 375 ---------- .../referential/ReferentialImportService.java | 832 ++++++++++----------- .../ReferentialTemporaryGearService.java | 305 ++++++++ .../ReferentialTemporaryPersonService.java | 292 ++++++++ .../ReferentialTemporarySpeciesService.java | 293 ++++++++ .../ReferentialTemporaryVesselService.java | 311 ++++++++ .../tutti/service/referential/SpeciesModel.java | 10 - .../tutti/service/referential/SpeciesRow.java | 45 +- .../tutti/service/referential/VesselModel.java | 1 - .../tutti/service/referential/VesselRow.java | 73 +- .../src/main/resources/ftl/pupitriReport_fr.ftl | 234 ++++++ .../resources/i18n/tutti-service_en_GB.properties | 16 +- .../resources/i18n/tutti-service_fr_FR.properties | 23 +- .../pupitri/PupitriImportServiceAno3898Test.java | 61 +- .../pupitri/PupitriImportServiceAno5032Test.java | 63 +- .../pupitri/PupitriImportServiceAno5079Test.java | 67 +- .../pupitri/PupitriImportServiceEvo5060Test.java | 59 +- .../pupitri/PupitriImportServiceEvo5062Test.java | 59 +- .../pupitri/PupitriImportServiceEvo6149Test.java | 203 +++++ ...viceTest.java => PupitriImportServiceTest.java} | 68 +- .../pupitri/PupitryImportServiceTestSupport.java | 77 ++ .../referential/ReferentialImportServiceTest.java | 464 ------------ ... => ReferentialTemporaryExportServiceTest.java} | 71 +- .../ReferentialTemporaryGearServiceTest.java | 172 +++++ .../ReferentialTemporaryPersonServiceTest.java | 122 +++ .../ReferentialTemporarySpeciesServiceTest.java | 207 +++++ .../ReferentialTemporaryVesselServiceTest.java | 137 ++++ .../src/test/resources/pupitri/evo-6149.car | 8 + .../src/test/resources/pupitri/evo-6149.tnk | 32 + .../test/resources/pupitri/evo-6149.tuttiProtocol | 154 ++++ tutti-ui-swing/pom.xml | 2 +- tutti-ui-swing/src/license/THIRD-PARTY.properties | 6 +- .../filtered-resources/tutti-help-fr.properties | 4 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 33 +- .../action/AbstractExportMultiPostAction.java | 93 --- .../action/AbstractImportMultiPostAction.java | 110 --- .../ui/swing/action/CreateBenthosMelagAction.java | 154 ++-- .../ui/swing/action/CreateSpeciesMelagAction.java | 158 ++-- .../swing/action/EditFishingOperationAction.java | 13 + .../tutti/ui/swing/action/ExportCruiseAction.java | 6 +- .../swing/action/ExportCruiseForSumatraAction.java | 6 +- .../action/ExportExistingTemporaryGearAction.java | 5 +- .../ExportExistingTemporaryPersonAction.java | 4 +- .../ExportExistingTemporarySpeciesAction.java | 4 +- .../ExportExistingTemporaryVesselAction.java | 4 +- .../ExportFishingOperationForSumatraAction.java | 12 +- ...n.java => ExportMultiPostAccidentalAction.java} | 22 +- .../swing/action/ExportMultiPostActionSupport.java | 200 +++++ ...tion.java => ExportMultiPostBenthosAction.java} | 20 +- .../swing/action/ExportMultiPostCatchAction.java | 87 +++ ...xportMultiPostIndividualObservationAction.java} | 22 +- ...java => ExportMultiPostMarineLitterAction.java} | 20 +- ...tion.java => ExportMultiPostSpeciesAction.java} | 20 +- .../tutti/ui/swing/action/ExportProgramAction.java | 6 +- .../tutti/ui/swing/action/ExportPupitriAction.java | 9 +- .../action/ExportTemporaryGearExampleAction.java | 5 +- .../action/ExportTemporaryPersonExampleAction.java | 5 +- .../ExportTemporarySpeciesExampleAction.java | 5 +- .../action/ExportTemporaryVesselExampleAction.java | 5 +- .../swing/action/ImportBenthosMultiPostAction.java | 126 ---- .../tutti/ui/swing/action/ImportCasinoAction.java | 44 -- ...n.java => ImportMultiPostAccidentalAction.java} | 22 +- .../swing/action/ImportMultiPostActionSupport.java | 262 +++++++ .../swing/action/ImportMultiPostBenthosAction.java | 111 +++ .../swing/action/ImportMultiPostCatchAction.java | 120 +++ ...mportMultiPostIndividualObservationAction.java} | 22 +- ...java => ImportMultiPostMarineLitterAction.java} | 67 +- .../swing/action/ImportMultiPostSpeciesAction.java | 112 +++ .../tutti/ui/swing/action/ImportPupitriAction.java | 89 ++- .../swing/action/ImportSpeciesMultiPostAction.java | 126 ---- .../ui/swing/action/ImportTemporaryGearAction.java | 4 +- .../swing/action/ImportTemporaryPersonAction.java | 4 +- .../swing/action/ImportTemporarySpeciesAction.java | 6 +- .../swing/action/ImportTemporaryVesselAction.java | 6 +- .../action/ReplaceTemporarySpeciesAction.java | 1 + .../swing/content/config/TuttiConfigUIHandler.java | 3 + .../tutti/ui/swing/content/home/SelectCruiseUI.css | 2 - .../content/operation/catches/EditCatchesUI.css | 19 + .../content/operation/catches/EditCatchesUI.jaxx | 2 + .../operation/catches/EditCatchesUIHandler.java | 23 +- .../operation/catches/SampleCategoryComponent.java | 35 +- ...wHelper.java => SpeciesAbleBatchRowHelper.java} | 54 +- .../catches/accidental/AccidentalBatchUI.css | 8 +- .../catches/accidental/AccidentalBatchUI.jaxx | 4 + .../accidental/AccidentalBatchUIHandler.java | 1 + .../catches/benthos/BenthosBatchTableModel.java | 2 +- .../operation/catches/benthos/BenthosBatchUI.css | 8 +- .../operation/catches/benthos/BenthosBatchUI.jaxx | 4 + .../catches/benthos/BenthosBatchUIHandler.java | 128 +--- .../IndividualObservationBatchUI.css | 8 +- .../IndividualObservationBatchUI.jaxx | 4 + .../IndividualObservationBatchUIHandler.java | 1 + .../catches/marinelitter/MarineLitterBatchUI.css | 8 +- .../catches/marinelitter/MarineLitterBatchUI.jaxx | 4 + .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../catches/species/ImportPupitriPopupUI.css | 10 +- .../catches/species/ImportPupitriPopupUI.jaxx | 10 +- .../species/ImportPupitriPopupUIHandler.java | 86 ++- .../catches/species/SpeciesBatchTableModel.java | 14 +- .../operation/catches/species/SpeciesBatchUI.css | 8 +- .../operation/catches/species/SpeciesBatchUI.jaxx | 4 + .../catches/species/SpeciesBatchUIHandler.java | 72 +- .../content/protocol/EditProtocolUIHandler.java | 10 +- .../referential/ManageTemporaryReferentialUI.css | 2 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 14 + .../util/attachment/AttachmentEditorUIHandler.java | 10 +- .../ui/swing/util/attachment/ButtonAttachment.java | 20 +- .../util/species/EnterMelagWeightUIHandler.java | 7 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 54 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 61 +- 173 files changed, 7610 insertions(+), 3386 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 d0605b87f66ca708a22afd70a30631f3f11ddc07 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:45:51 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 44b941f..f96eded 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.10-SNAPSHOT</version> + <version>3.9</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 2256dee..49ad7e7 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.10-SNAPSHOT</version> + <version>3.9</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 9b5ec38..a4e694f 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.10-SNAPSHOT</version> + <version>3.9</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index e47383b..774a076 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.10-SNAPSHOT</version> + <version>3.9</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index cd9aeb9..d4a1ef3 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.10-SNAPSHOT</version> + <version>3.9</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 f2ba60e533b4a496dcf90dfc78f4e85bfeec67e5 Merge: d0605b8 bc41c04 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:45:52 2014 +0000 Merge branch 'master' into develop .../src/license/THIRD-PARTY.properties | 4 ++-- tutti-service/src/license/THIRD-PARTY.properties | 6 +++--- .../ifremer/tutti/service/PdfGeneratorService.java | 24 ++++++++++++++++++++++ .../service/catches/multipost/CatchBatchRow.java | 24 ++++++++++++++++++++++ .../catches/multipost/CatchBatchRowModel.java | 24 ++++++++++++++++++++++ .../catches/multipost/MultiPostConstants.java | 24 ++++++++++++++++++++++ .../fr/ifremer/tutti/service/pupitri/BoxType.java | 24 ++++++++++++++++++++++ .../pupitri/CarrouselImportRequestResult.java | 24 ++++++++++++++++++++++ .../service/pupitri/PupitriExportService.java | 24 ++++++++++++++++++++++ .../tutti/service/pupitri/PupitriSignContext.java | 24 ++++++++++++++++++++++ .../pupitri/report/PupitriImportReportModel.java | 24 ++++++++++++++++++++++ .../pupitri/report/PupitriImportReportRow.java | 24 ++++++++++++++++++++++ .../service/referential/ImportRequestResult.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryGearService.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryPersonService.java | 24 ++++++++++++++++++++++ .../ReferentialTemporarySpeciesService.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryVesselService.java | 24 ++++++++++++++++++++++ .../pupitri/PupitriImportServiceEvo6149Test.java | 24 ++++++++++++++++++++++ .../pupitri/PupitryImportServiceTestSupport.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryGearServiceTest.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryPersonServiceTest.java | 24 ++++++++++++++++++++++ .../ReferentialTemporarySpeciesServiceTest.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryVesselServiceTest.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../swing/action/ExportMultiPostCatchAction.java | 24 ++++++++++++++++++++++ .../swing/action/ImportMultiPostCatchAction.java | 24 ++++++++++++++++++++++ 26 files changed, 580 insertions(+), 5 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 a150129a203dacbcb444c19c078935c0d16dbd65 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 25 11:45:52 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 f96eded..44b941f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.9</version> + <version>3.10-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 49ad7e7..2256dee 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</version> + <version>3.10-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index a4e694f..9b5ec38 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</version> + <version>3.10-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 774a076..e47383b 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</version> + <version>3.10-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index d4a1ef3..cd9aeb9 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</version> + <version>3.10-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