branch support/3.13.x updated (3943f74 -> a40913b)
This is an automated email from the git hooks/post-receive script. New change to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git from 3943f74 use last version of launcher version adds 69b37f8 prepease release 3.13.2 new 85f854d prepare release 3.12.2 new d367c6e do not deliver latest update file new f4adee1 fix tutti-launcher update url new a40913b prepare next developpment version The 4 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 a40913bc1143af3d6363b263e7f2953f1320c913 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 07:34:20 2015 +0000 prepare next developpment version commit f4adee12c851bf56f224897532872736836e95be Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 07:25:56 2015 +0000 fix tutti-launcher update url commit d367c6e869678760b6fb0fed92846dd16b4d253a Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 07:25:44 2015 +0000 do not deliver latest update file commit 85f854db558916ecebf68adb7e19012edf715e35 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 07:16:15 2015 +0000 prepare release 3.12.2 Summary of changes: pom.xml | 22 ++---------------- src/update/tutti-application.properties | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-report-generator/src/main/assembly/bin.xml | 23 ++++++++++++++++++ .../java/fr/ifremer/tutti/report/ReportConfig.java | 24 +++++++++++++++++++ .../java/fr/ifremer/tutti/report/ReportEngine.java | 24 +++++++++++++++++++ .../java/fr/ifremer/tutti/report/RunReport.java | 24 +++++++++++++++++++ tutti-service/pom.xml | 4 ++-- .../service/report/ReportGenerationContext.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationRequest.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationResult.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationService.java | 24 +++++++++++++++++++ .../service/bigfin/BigfinImportService2Test.java | 24 +++++++++++++++++++ .../report/ReportGenerationServiceTest.java | 24 +++++++++++++++++++ .../2014.12.08/allegro-tutti/common/css/common.css | 27 ++++++++++++++++++++-- .../2014.12.08/allegro-tutti/common/js/common.js | 25 +++++++++++++++++++- .../2014.12.08/allegro-tutti/common/js/messages.js | 23 ++++++++++++++++++ .../2014.12.08/allegro-tutti/common/js/util.js | 23 ++++++++++++++++++ .../allegro-tutti/common/nls/common.properties | 23 ++++++++++++++++++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 23 ++++++++++++++++++ .../content/report/actions/OpenReportAction.java | 24 +++++++++++++++++++ .../content/report/actions/SaveReportAction.java | 24 +++++++++++++++++++ 26 files changed, 438 insertions(+), 31 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 support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit 85f854db558916ecebf68adb7e19012edf715e35 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 07:16:15 2015 +0000 prepare release 3.12.2 --- pom.xml | 2 +- tutti-report-generator/src/main/assembly/bin.xml | 23 ++++++++++++++++++ .../java/fr/ifremer/tutti/report/ReportConfig.java | 24 +++++++++++++++++++ .../java/fr/ifremer/tutti/report/ReportEngine.java | 24 +++++++++++++++++++ .../java/fr/ifremer/tutti/report/RunReport.java | 24 +++++++++++++++++++ tutti-service/pom.xml | 2 +- .../service/report/ReportGenerationContext.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationRequest.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationResult.java | 24 +++++++++++++++++++ .../service/report/ReportGenerationService.java | 24 +++++++++++++++++++ .../service/bigfin/BigfinImportService2Test.java | 24 +++++++++++++++++++ .../report/ReportGenerationServiceTest.java | 24 +++++++++++++++++++ .../2014.12.08/allegro-tutti/common/css/common.css | 27 ++++++++++++++++++++-- .../2014.12.08/allegro-tutti/common/js/common.js | 25 +++++++++++++++++++- .../2014.12.08/allegro-tutti/common/js/messages.js | 23 ++++++++++++++++++ .../2014.12.08/allegro-tutti/common/js/util.js | 23 ++++++++++++++++++ .../allegro-tutti/common/nls/common.properties | 23 ++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 ++++++++++++++++++ .../content/report/actions/OpenReportAction.java | 24 +++++++++++++++++++ .../content/report/actions/SaveReportAction.java | 24 +++++++++++++++++++ 20 files changed, 430 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index b04d7b9..4f2140e 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>1.8.1</version> + <version>1.8.2</version> </parent> <groupId>fr.ifremer</groupId> diff --git a/tutti-report-generator/src/main/assembly/bin.xml b/tutti-report-generator/src/main/assembly/bin.xml index 3828df6..8a25c59 100644 --- a/tutti-report-generator/src/main/assembly/bin.xml +++ b/tutti-report-generator/src/main/assembly/bin.xml @@ -1,3 +1,26 @@ +<!-- + #%L + Tutti :: Report Generator + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2012 - 2015 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% + --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> diff --git a/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportConfig.java b/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportConfig.java index 2e3261b..54d79ba 100644 --- a/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportConfig.java +++ b/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportConfig.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.report; +/* + * #%L + * Tutti :: Report Generator + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.File; /** diff --git a/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportEngine.java b/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportEngine.java index b737287..e83e5fe 100644 --- a/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportEngine.java +++ b/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/ReportEngine.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.report; +/* + * #%L + * Tutti :: Report Generator + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.eclipse.birt.core.exception.BirtException; import org.eclipse.birt.core.framework.Platform; import org.eclipse.birt.report.engine.api.EngineConfig; diff --git a/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/RunReport.java b/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/RunReport.java index 4b00979..906013b 100644 --- a/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/RunReport.java +++ b/tutti-report-generator/src/main/java/fr/ifremer/tutti/report/RunReport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.report; +/* + * #%L + * Tutti :: Report Generator + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.File; /** diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index c09c897..21d6a8b 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -221,7 +221,7 @@ <executions> <execution> <id>get-report-generator-env</id> - <phase>prepare-package</phase> + <phase>process-resources</phase> <goals> <goal>unpack</goal> </goals> diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationContext.java index 56921e1..846861e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationContext.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.report; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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 java.io.File; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java index 3916416..f9e42ea 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationRequest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.report; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.File; import java.io.Serializable; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationResult.java index ccebd0f..0da3bee 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationResult.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.report; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.File; import java.io.Serializable; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java index 8d39977..e6ce65b 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportGenerationService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.report; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.tutti.TuttiConfiguration; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java index 830708b..b764a0a 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportService2Test.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.bigfin; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.Predicate; import com.google.common.collect.Lists; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportGenerationServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportGenerationServiceTest.java index 5dd9ce3..f5846f5 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportGenerationServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportGenerationServiceTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.report; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.TuttiConfiguration; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; diff --git a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/css/common.css b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/css/common.css index 7d61a6b..13d5b94 100644 --- a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/css/common.css +++ b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/css/common.css @@ -1,3 +1,26 @@ +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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% + */ /** * ================================================= * GENERAL @@ -148,7 +171,7 @@ /** * ------------------------------------------------- - * Styles particuliers (� appliquer de mani�re explicite dans le rapport) + * Styles particuliers (� appliquer de mani�re explicite dans le rapport) * ------------------------------------------------- */ .grid-contacts { @@ -236,7 +259,7 @@ /** * ------------------------------------------------- - * Styles particuliers (� appliquer de mani�re explicite dans le rapport) + * Styles particuliers (� appliquer de mani�re explicite dans le rapport) * ------------------------------------------------- */ diff --git a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/common.js b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/common.js index 0c488b1..dc6fef0 100644 --- a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/common.js +++ b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/common.js @@ -1,3 +1,26 @@ +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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% + */ /* =================================================================== * common.js * ------------------------------------------------------------------- @@ -28,5 +51,5 @@ var LIST_SPECIES = new Array(); /** numero de la premiere colonne de la categorisation du lot dans le fichier catch.csv **/ var startCateg=12; -/** nom de la premi�re colonne apr�s les colonnes de cat�gorisations des lots **/ +/** nom de la premi�re colonne apr�s les colonnes de cat�gorisations des lots **/ var columnNameNotCateg="Code_Longueur"; \ No newline at end of file diff --git a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/messages.js b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/messages.js index 46edb0a..3b11dcb 100644 --- a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/messages.js +++ b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/messages.js @@ -1,3 +1,26 @@ +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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% + */ /* =================================================================== * message.js * ------------------------------------------------------------------- diff --git a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/util.js b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/util.js index 3d46710..96cae42 100644 --- a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/util.js +++ b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/js/util.js @@ -1,3 +1,26 @@ +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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% + */ /* =================================================================== * util.js * ------------------------------------------------------------------- diff --git a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/nls/common.properties b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/nls/common.properties index 5b1f511..3abeb9d 100644 --- a/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/nls/common.properties +++ b/tutti-service/src/test/resources/report/2014.12.08/allegro-tutti/common/nls/common.properties @@ -1,3 +1,26 @@ +### +# #%L +# Tutti :: Service +# $Id:$ +# $HeadURL:$ +# %% +# Copyright (C) 2012 - 2015 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% +### annee = Ann\u00E9e : 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 02223b8..30c8de6 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 - 2015 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 #Wed Mar 11 10:26:35 CET 2015 \ "tutti.editProtocol.action.addCaracteristicMapping.help"\ = diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/OpenReportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/OpenReportAction.java index 4192e13..45cc922 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/OpenReportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/OpenReportAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.report.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.ui.swing.action.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.content.report.ReportUI; import fr.ifremer.tutti.ui.swing.content.report.ReportUIHandler; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/SaveReportAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/SaveReportAction.java index 34ecfbc..384d5e5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/SaveReportAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/report/actions/SaveReportAction.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.report.actions; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.data.FishingOperation; import fr.ifremer.tutti.ui.swing.action.AbstractTuttiAction; -- 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 support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit d367c6e869678760b6fb0fed92846dd16b4d253a Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 07:25:44 2015 +0000 do not deliver latest update file --- pom.xml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/pom.xml b/pom.xml index 4f2140e..5c2220e 100644 --- a/pom.xml +++ b/pom.xml @@ -836,24 +836,6 @@ <artifactId>wagon-maven-plugin</artifactId> <executions> <execution> - <id>deploy tutti-application.properties</id> - <phase>deploy</phase> - <inherited>false</inherited> - <goals> - <goal>upload-single</goal> - </goals> - <configuration> - <serverId>doc.codelutin.com</serverId> - <fromFile> - ${project.build.directory}/update/tutti-application.properties - </fromFile> - <toFile>tutti-application-latest.properties</toFile> - <url> - scpexe://forge.codelutin.com/var/www/ApplicationUpdate/http/tutti - </url> - </configuration> - </execution> - <execution> <id>deploy tutti-application-${project.version}.properties</id> <phase>deploy</phase> <inherited>false</inherited> -- 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 support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit f4adee12c851bf56f224897532872736836e95be Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 07:25:56 2015 +0000 fix tutti-launcher update url --- src/update/tutti-application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/update/tutti-application.properties b/src/update/tutti-application.properties index c8e139b..27fe827 100644 --- a/src/update/tutti-application.properties +++ b/src/update/tutti-application.properties @@ -38,7 +38,7 @@ windows.x86.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/c ################################################################################ launcher.version=@launcherVersion@ -launcher.url=zip:@distroUrl@/fr/ifremer/tutti/tutti-ui-swing/@launcherVersion@/tutti-ui-swing-@launcherVersion@-launcher.zip +launcher.url=zip:@distroUrl@/fr/ifremer/tutti/tutti-launcher/@launcherVersion@/tutti-launcher-@launcherVersion@.zip ################################################################################ ### Tutti Updates ############################################################## -- 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 support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit a40913bc1143af3d6363b263e7f2953f1320c913 Author: Maven Release <maven-release@codelutin.com> Date: Thu Mar 12 07:34:20 2015 +0000 prepare next developpment version --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 5c2220e..943fa6f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.2</version> + <version>3.13.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 000885e..6d79c3b 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.13.2</version> + <version>3.13.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 0811c54..c9ce267 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.13.2</version> + <version>3.13.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index faacbbe..b044424 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.2</version> + <version>3.13.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 21d6a8b..2bde83e 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.13.2</version> + <version>3.13.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index bbac8cc..675bd8f 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13.2</version> + <version>3.13.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index c73bb42..f479b29 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.13.2</version> + <version>3.13.3-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