- Tutti-commits - mailman.cloud.codelutin.com

r861 - trunk
by tchemit＠users.forge.codelutin.com April 23, 2013

April 23, 2013

Author: tchemit Date: 2013-04-23 09:34:30 +0200 (Tue, 23 Apr 2013) New Revision: 861 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/861 Log: fixes #2349: Mise ?\195?\160 jour jre 1.7u21 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-23 06:12:46 UTC (rev 860) +++ trunk/pom.xml 2013-04-23 07:34:30 UTC (rev 861) @@ -165,10 +165,10 @@ <jMockVersion>2.5.1</jMockVersion>  - <jreVersion>1.7.17</jreVersion> + <jreVersion>1.7.21</jreVersion>  -  +  </properties>

1 0

r860 - in trunk: tutti-persistence/src/main/resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com April 23, 2013

April 23, 2013

Author: tchemit Date: 2013-04-23 08:12:46 +0200 (Tue, 23 Apr 2013) New Revision: 860 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/860 Log: - fix accidental batch loading (was loading individual observation too) - fix caracteristicmapcell component tooltip Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-04-22 19:49:42 UTC (rev 859) +++ trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-04-23 06:12:46 UTC (rev 860) @@ -330,6 +330,7 @@ SampleImpl s WHERE s.fishingOperation.id= :fishingOperationId + AND s.batch IS NULL ORDER BY s.creationDate ]]> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-04-22 19:49:42 UTC (rev 859) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapCellComponent.java 2013-04-23 06:12:46 UTC (rev 860) @@ -31,6 +31,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractSelectTableAction; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import jaxx.runtime.SwingUtil; +import org.apache.commons.collections.MapUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.decorator.Decorator; @@ -48,7 +49,10 @@ import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.io.Serializable; +import static org.nuiton.i18n.I18n._; + /** * @author kmorin <kmorin(a)codelutin.com> * @since 1.4 @@ -92,16 +96,29 @@ } public void setToolTipText(CaracteristicMap map) { - String tooltipText = null; + StringBuilder builder = new StringBuilder(); if (map != null) { - tooltipText = "<html><ul>"; + builder.append("<html><ul>"); + if (MapUtils.isEmpty(map)) { + builder.append("<li>"); + builder.append(_("tutti.caracteristicMapEditor.none.tip")); + builder.append("</li>"); + } for (Caracteristic caracteristic : map.keySet()) { - tooltipText += "<li>" + caracteristicDecorator.toString(caracteristic) + - " : " + valueDecorator.toString(map.get(caracteristic)) + "</li>"; + builder.append("<li>"); + builder.append(caracteristicDecorator.toString(caracteristic)); + builder.append(" : "); + Serializable bean = map.get(caracteristic); + if (bean instanceof CaracteristicQualitativeValue) { + builder.append(valueDecorator.toString(bean)); + } else { + builder.append(bean); + } + builder.append("</li>"); } - tooltipText += "</ul></html>"; + builder.append("</ul></html>"); } - setToolTipText(tooltipText); + setToolTipText(builder.toString()); } public static TableCellRenderer newRender(TuttiUIContext context) { Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-22 19:49:42 UTC (rev 859) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-23 06:12:46 UTC (rev 860) @@ -28,6 +28,7 @@ tutti.attachmentEditor.field.file=Fichier tutti.attachmentEditor.field.fileComment=Commentaire tutti.attachmentEditor.field.fileName=Nom +tutti.caracteristicMapEditor.none.tip=Pas de caractéristiques tutti.attachmentEditor.none.tip=Pas de pièce-jointes tutti.attachmentEditor.saveAttachment.button=Enregistrer tutti.attachmentEditor.saveAttachment.fail.message=Une erreur est survenue lors de la sauvegarde du fichier.

1 0

r859 - in trunk: tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra tutti-ui-swing/src/main/filtered-resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home
by tchemit＠users.forge.codelutin.com April 22, 2013

April 22, 2013

Author: tchemit Date: 2013-04-22 21:49:42 +0200 (Mon, 22 Apr 2013) New Revision: 859 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/859 Log: add missing svn properties + license headers Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/CatchRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/CatchRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/CatchRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/CatchRow.java 2013-04-22 19:43:04 UTC (rev 858) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/CatchRow.java 2013-04-22 19:49:42 UTC (rev 859) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.sumatra; +/* + * #%L + * Tutti :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 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.persistence.entities.referential.Species; Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/CatchRow.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/CatchRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/CatchRowModel.java 2013-04-22 19:43:04 UTC (rev 858) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/CatchRowModel.java 2013-04-22 19:49:42 UTC (rev 859) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.sumatra; +/* + * #%L + * Tutti :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 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.persistence.entities.referential.Species; Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/CatchRowModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java 2013-04-22 19:43:04 UTC (rev 858) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java 2013-04-22 19:49:42 UTC (rev 859) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.sumatra; +/* + * #%L + * Tutti :: Service + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 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.Preconditions; import com.google.common.collect.Lists; Property changes on: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/sumatra/TuttiCatchesSumatraExportService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-04-22 19:43:04 UTC (rev 858) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-04-22 19:49:42 UTC (rev 859) @@ -1,3 +1,26 @@ +### +# #%L +# Tutti :: UI +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 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 #Mon Apr 22 10:46:45 CEST 2013 tutti.config.help=config.html Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-04-22 19:43:04 UTC (rev 858) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-04-22 19:49:42 UTC (rev 859) @@ -1,3 +1,26 @@ +### +# #%L +# Tutti :: UI +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 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 #Mon Apr 22 10:46:45 CEST 2013 tutti.config.help=config.html Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java 2013-04-22 19:43:04 UTC (rev 858) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/ExportCruiseForSumatraAction.java 2013-04-22 19:49:42 UTC (rev 859) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.home; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 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.TuttiIOUtil; import fr.ifremer.tutti.persistence.entities.data.Cruise;

1 0

r858 - trunk
by tchemit＠users.forge.codelutin.com April 22, 2013

April 22, 2013

Author: tchemit Date: 2013-04-22 21:43:04 +0200 (Mon, 22 Apr 2013) New Revision: 858 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/858 Log: pass to last stable of jaxx Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-22 19:21:00 UTC (rev 857) +++ trunk/pom.xml 2013-04-22 19:43:04 UTC (rev 858) @@ -132,7 +132,7 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.18-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.18</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion>

1 0

r857 - in trunk: . tutti-service/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com April 22, 2013

April 22, 2013

Author: tchemit Date: 2013-04-22 21:21:00 +0200 (Mon, 22 Apr 2013) New Revision: 857 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/857 Log: use last stable of adagio fix i18n Modified: trunk/pom.xml trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-22 17:29:47 UTC (rev 856) +++ trunk/pom.xml 2013-04-22 19:21:00 UTC (rev 857) @@ -138,7 +138,7 @@ <slf4jVersion>1.7.2</slf4jVersion> - <adagioVersion>3.3.5-SNAPSHOT</adagioVersion> + <adagioVersion>3.3.5</adagioVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-22 17:29:47 UTC (rev 856) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-04-22 19:21:00 UTC (rev 857) @@ -71,6 +71,7 @@ tutti.service.operations.computeWeights.error.incoherentTotal= tutti.service.operations.computeWeights.marineLitter.error.incoherentTotal= tutti.service.operations.computeWeights.marineLitter.error.noWeight= +tutti.service.operations.computeWeights.species.error.incoherentCategoryWeight= tutti.service.operations.computeWeights.species.error.incoherentParentCategoryWeight= tutti.service.operations.computeWeights.species.error.incoherentRowWeightFrequency= tutti.service.operations.computeWeights.species.error.incoherentTotalSorted= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-22 17:29:47 UTC (rev 856) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-04-22 19:21:00 UTC (rev 857) @@ -71,6 +71,7 @@ tutti.service.operations.computeWeights.error.incoherentTotal=Le poids total de la capture ne correspond pas à la somme des poids totaux Vrac, Hors Vrac et non triés tutti.service.operations.computeWeights.marineLitter.error.incoherentTotal=Le poids total des macro-déchets est inférieur à la somme des poids des macro-déchets saisis tutti.service.operations.computeWeights.marineLitter.error.noWeight=Un lot de macro-déchets n'a pas de poids +tutti.service.operations.computeWeights.species.error.incoherentCategoryWeight= tutti.service.operations.computeWeights.species.error.incoherentParentCategoryWeight=Le poids de la catégorie d'un lot des espèces est différent de la somme des poids de ses sous-catégories tutti.service.operations.computeWeights.species.error.incoherentRowWeightFrequency=Le poids total des mensurations d'un lot des espèces est différent du poids du sous-échantillon tutti.service.operations.computeWeights.species.error.incoherentTotalSorted=Le poids total Vrac des espèces est inférieur à la somme des poids Vrac triés, inerte trié et vivant non détaillé trié

1 0

r856 - in trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence: . service
by tchemit＠users.forge.codelutin.com April 22, 2013

April 22, 2013

Author: tchemit Date: 2013-04-22 19:29:47 +0200 (Mon, 22 Apr 2013) New Revision: 856 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/856 Log: fix db tests Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java 2013-04-22 17:03:12 UTC (rev 855) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/DatabaseFixtures.java 2013-04-22 17:29:47 UTC (rev 856) @@ -101,11 +101,11 @@ } public int refNbSpecies() { - return 16946; + return 16961; } public int refNbReferentSpecies() { - return 8645; + return 8649; } public int refNbScientificGear() { @@ -173,7 +173,7 @@ } public String refSpeciesRefTaxCode() { - return "SEPIOFF"; + return "SEPIOFF "; } public String refSpeciesVernacularCode() { Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java 2013-04-22 17:03:12 UTC (rev 855) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java 2013-04-22 17:29:47 UTC (rev 856) @@ -214,6 +214,7 @@ @Test public void getAllReferentSpecies() { List<Species> result = service.getAllReferentSpecies(); + TuttiEntities.splitById(result); assertResultList(result, fixtures.refNbReferentSpecies()); TuttiEntities.splitByTaxonId(result);

1 0

r855 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-service/src/main/java/fr/ifremer/tutti/service/catches tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency tutti-ui-swing/src/main/java/f
by kmorin＠users.forge.codelutin.com April 22, 2013

April 22, 2013

Author: kmorin Date: 2013-04-22 19:03:12 +0200 (Mon, 22 Apr 2013) New Revision: 855 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/855 Log: fixes #2214 [CAMPAGNE] - Navire - Changement du navire saisi use isNotEmpty instead of !isEmpty Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ExportCatchesReportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-04-22 13:54:29 UTC (rev 854) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2013-04-22 17:03:12 UTC (rev 855) @@ -58,6 +58,7 @@ import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus; import fr.ifremer.tutti.persistence.entities.TuttiBeanFactory; import fr.ifremer.tutti.persistence.entities.data.Cruise; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.persistence.entities.referential.Gear; import fr.ifremer.tutti.persistence.entities.referential.Person; @@ -99,6 +100,9 @@ protected ProgramPersistenceService programService; @Autowired + protected FishingOperationPersistenceService fishingOperationService; + + @Autowired protected VesselPersonFeaturesPersistenceHelper vesselPersonFeaturesPersistenceHelper; @Resource(name = "scientificCruiseDao") @@ -289,9 +293,20 @@ throw new DataRetrievalFailureException("Could not retrieve cruise with id=" + bean.getId()); } + boolean vesselChanged = !bean.getVessel().equals(scientificCruise.getVessel()); + cruiseToEntity(bean, scientificCruise); scientificCruiseDao.update(scientificCruise); + if (vesselChanged) { + Vessel vessel = bean.getVessel(); + List<FishingOperation> operations = fishingOperationService.getAllFishingOperation(bean.getId()); + for (FishingOperation operation : operations) { + operation.setVessel(vessel); + } + fishingOperationService.saveFishingOperations(operations); + } + return bean; } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java 2013-04-22 13:54:29 UTC (rev 854) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceService.java 2013-04-22 17:03:12 UTC (rev 855) @@ -28,6 +28,7 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import org.springframework.transaction.annotation.Transactional; +import java.util.Collection; import java.util.List; /** @@ -50,5 +51,8 @@ FishingOperation saveFishingOperation(FishingOperation bean); @Transactional(readOnly = false) + Collection<FishingOperation> saveFishingOperations(Collection<FishingOperation> beans); + + @Transactional(readOnly = false) void deleteFishingOperation(String id); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-04-22 13:54:29 UTC (rev 854) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-04-22 17:03:12 UTC (rev 855) @@ -85,14 +85,7 @@ import java.io.Serializable; import java.sql.Timestamp; import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * @author tchemit <chemit(a)codelutin.com> @@ -372,18 +365,8 @@ @Override public FishingOperation saveFishingOperation(FishingOperation bean) { - Preconditions.checkNotNull(bean); - Preconditions.checkNotNull(bean.getId()); - Preconditions.checkNotNull(bean.getCruise()); - Preconditions.checkNotNull(bean.getCruise().getId()); - //TODO-TC Voir si il n'y a pas d'autre données obligatoires + checkFishingOperation(bean); - if (bean.getGearShootingStartDate() != null && bean.getGearShootingEndDate() != null) { - - //make sure not same date - Preconditions.checkArgument(!bean.getGearShootingStartDate().equals(bean.getGearShootingEndDate())); - } - getCurrentSession().clear(); getCurrentSession().setFlushMode(FlushMode.COMMIT); fr.ifremer.adagio.core.dao.data.operation.FishingOperation fishingOperation = fishingOperationDao.load(Integer.valueOf(bean.getId())); @@ -397,6 +380,27 @@ } @Override + public Collection<FishingOperation> saveFishingOperations(Collection<FishingOperation> beans) { + getCurrentSession().clear(); + getCurrentSession().setFlushMode(FlushMode.COMMIT); + + List<fr.ifremer.adagio.core.dao.data.operation.FishingOperation> operations = Lists.newArrayList(); + for (FishingOperation bean : beans) { + fr.ifremer.adagio.core.dao.data.operation.FishingOperation fishingOperation = + fishingOperationDao.load(Integer.valueOf(bean.getId())); + if (fishingOperation == null) { + throw new DataRetrievalFailureException("Could not retrieve fishing operation with id=" + bean.getId()); + } + beanToEntity(bean, fishingOperation); + operations.add(fishingOperation); + } + + fishingOperationDao.update(operations); + getCurrentSession().flush(); + return beans; + } + + @Override public void deleteFishingOperation(String id) { Preconditions.checkNotNull(id); @@ -409,6 +413,20 @@ //-- Internal methods --// //------------------------------------------------------------------------// + protected void checkFishingOperation(FishingOperation bean) { + Preconditions.checkNotNull(bean); + Preconditions.checkNotNull(bean.getId()); + Preconditions.checkNotNull(bean.getCruise()); + Preconditions.checkNotNull(bean.getCruise().getId()); + //TODO-TC Voir si il n'y a pas d'autre données obligatoires + + if (bean.getGearShootingStartDate() != null && bean.getGearShootingEndDate() != null) { + + //make sure not same date + Preconditions.checkArgument(!bean.getGearShootingStartDate().equals(bean.getGearShootingEndDate())); + } + } + protected void getVesselUseCaracteristics(String fishingOperationId, FishingOperation result) { // retrieve fishing operation caracteristics Iterator<Object[]> list = queryList( Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ExportCatchesReportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ExportCatchesReportService.java 2013-04-22 13:54:29 UTC (rev 854) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/ExportCatchesReportService.java 2013-04-22 17:03:12 UTC (rev 855) @@ -142,7 +142,7 @@ List<Map<String, Object>> catchList = Lists.newArrayList(catches.values()); // add the benthos row - if (!CollectionUtils.isEmpty(rootBenthosBatch.getChildren())) { + if (CollectionUtils.isNotEmpty(rootBenthosBatch.getChildren())) { Map<String, Object> benthosCatch = createBenthosCatch(rootBenthosBatch, catchBatch.getBenthosTotalComputedWeight(), totalWeight); catchList.add(benthosCatch); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java 2013-04-22 13:54:29 UTC (rev 854) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java 2013-04-22 17:03:12 UTC (rev 855) @@ -308,7 +308,7 @@ carrouselSortedWeight += beanWeight; } - if (!CollectionUtils.isEmpty(speciesList)) { + if (CollectionUtils.isNotEmpty(speciesList)) { Species species = speciesList.get(0); PupitriCatch pupitriCatch = new PupitriCatch(species, sorted); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-04-22 13:54:29 UTC (rev 854) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java 2013-04-22 17:03:12 UTC (rev 855) @@ -28,8 +28,11 @@ import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.TuttiUIContext; +import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import javax.swing.*; + import static org.nuiton.i18n.I18n._; /** @@ -40,20 +43,43 @@ */ public class SaveCruiseAction extends AbstractTuttiAction<EditCruiseUIModel, EditCruiseUI, EditCruiseUIHandler> { + protected PersistenceService persistenceService; + public SaveCruiseAction(EditCruiseUIHandler handler) { super(handler, true); + persistenceService = getContext().getPersistenceService(); } - /** - * If the event source is a TuttiScreen, then the screen changes to the source. - * Otherwise, the screen changes to the home. - */ @Override + protected boolean prepareAction() throws Exception { + boolean result = super.prepareAction(); + + Cruise bean = getModel().toBean(); + if (!TuttiEntities.isNew(bean)) { + Cruise oldCruise = persistenceService.getCruise(bean.getId()); + if (!oldCruise.getVessel().equals(bean.getVessel())) { + String htmlMessage = String.format( + AbstractTuttiUIHandler.CONFIRMATION_FORMAT, + _("tutti.editCruise.action.save.vesselChanged.message"), + _("tutti.editCruise.action.save.vesselChanged.help")); + + int answer = JOptionPane.showConfirmDialog(getContext().getActionUI(), + htmlMessage, + _("tutti.editCruise.action.save.vesselChanged.title"), + JOptionPane.OK_CANCEL_OPTION, + JOptionPane.WARNING_MESSAGE); + + result = answer == JOptionPane.OK_OPTION; + } + } + + return result; + } + + @Override protected void doAction() throws Exception { TuttiUIContext context = getContext(); EditCruiseUIModel model = getModel(); - PersistenceService persistenceService = - getContext().getPersistenceService(); Cruise bean = model.toBean(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-04-22 13:54:29 UTC (rev 854) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-04-22 17:03:12 UTC (rev 855) @@ -296,7 +296,7 @@ && (!speciesProtocol.isMaturityEnabled() || row.getMaturityCategoryValue() != null) && (!speciesProtocol.isAgeEnabled() || row.getAgeCategoryValue() != null) && (!speciesProtocol.isCountIfNoFrequencyEnabled() - || !CollectionUtils.isEmpty(row.getFrequency()) + || CollectionUtils.isNotEmpty(row.getFrequency()) || row.getNumber() != null); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-04-22 13:54:29 UTC (rev 854) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-04-22 17:03:12 UTC (rev 855) @@ -432,7 +432,7 @@ // try to load existing frequency - if (!CollectionUtils.isEmpty(frequency)) { + if (CollectionUtils.isNotEmpty(frequency)) { BenthosFrequencyTableModel tableModel = getTableModel(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-04-22 13:54:29 UTC (rev 854) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-04-22 17:03:12 UTC (rev 855) @@ -293,7 +293,7 @@ && (!speciesProtocol.isMaturityEnabled() || row.getMaturityCategoryValue() != null) && (!speciesProtocol.isAgeEnabled() || row.getAgeCategoryValue() != null) && (!speciesProtocol.isCountIfNoFrequencyEnabled() - || !CollectionUtils.isEmpty(row.getFrequency()) + || CollectionUtils.isNotEmpty(row.getFrequency()) || row.getNumber() != null); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-04-22 13:54:29 UTC (rev 854) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-04-22 17:03:12 UTC (rev 855) @@ -433,7 +433,7 @@ // try to load existing frequency - if (!CollectionUtils.isEmpty(frequency)) { + if (CollectionUtils.isNotEmpty(frequency)) { SpeciesFrequencyTableModel tableModel = getTableModel(); Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-22 13:54:29 UTC (rev 854) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-22 17:03:12 UTC (rev 855) @@ -410,6 +410,9 @@ tutti.editCruise.action.generateCampaignName= tutti.editCruise.action.generateCampaignName.mnemonic= tutti.editCruise.action.generateName.tip= +tutti.editCruise.action.save.vesselChanged.help= +tutti.editCruise.action.save.vesselChanged.message= +tutti.editCruise.action.save.vesselChanged.title= tutti.editCruise.action.saveCruise= tutti.editCruise.action.saveCruise.mnemonic= tutti.editCruise.action.saveCruise.tip= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-22 13:54:29 UTC (rev 854) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-22 17:03:12 UTC (rev 855) @@ -399,6 +399,9 @@ tutti.editCruise.action.generateCampaignName=Générer le nom tutti.editCruise.action.generateCampaignName.mnemonic=G tutti.editCruise.action.generateName.tip=Générer le nom normalisé de la campagne +tutti.editCruise.action.save.vesselChanged.help=Le navire des traits de la campagne va également être modifié.<ul><li><strong>Annuler</strong> pour ne pas enregistrer les modifications de la campagne ni les traits</li><li><strong>OK</strong> pour enregistrer la campagne et modifier le navire des traits</li></ul>. +tutti.editCruise.action.save.vesselChanged.message=Le navire de la campagne a été modifié. +tutti.editCruise.action.save.vesselChanged.title=Navire modifié tutti.editCruise.action.saveCruise=Enregistrer tutti.editCruise.action.saveCruise.mnemonic=E tutti.editCruise.action.saveCruise.tip=Enregistrer la campagne @@ -859,7 +862,7 @@ tutti.label.tab.catches=Captures tutti.label.tab.catchesCaracteristics=Résumé tutti.label.tab.fishingOperation=Trait -tutti.label.tab.individualObservations=Observatiosn individuelles +tutti.label.tab.individualObservations=Observations individuelles tutti.label.tab.marineLitter=Macro déchets tutti.label.tab.plancton=Plancton tutti.label.tab.species=Espèces

1 0

Build failed in Jenkins: tutti #695
by admin+hudson＠codelutin.com April 22, 2013

April 22, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/695/changes> Changes: [Kevin Morin] fixes #1987 [PROTOCOLE] - Gestion des contrôles/infos obligatoires en validation [Tony Chemit] refs #1875: [IMP/EXP] - Export des données de campagne : format générique (desactivation pour le moment des actions + deplacement de la configuration dans le module service) [Tony Chemit] fixes #2345: [CAPTURES] Muavaise remonté des arbres d'échantillonage [Tony Chemit] fixes #2345: [CAPTURES] Muavaise remonté des arbres d'échantillonage ------------------------------------------ [...truncated 579 lines...] [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/pom.xml> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-service/2.0-SNAPSHOT/tutti-service-2.0-SNAPSHOT.pom mojoSucceeded org.apache.maven.plugins:maven-install-plugin:2.4(default-install) projectSucceeded fr.ifremer.tutti:tutti-service:2.0-SNAPSHOT projectStarted fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 2.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 39.1 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… (2 KB at 35.2 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/2.… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/2.5.18-… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/2.… (808 B at 25.5 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/2.5.18-… (808 B at 24.7 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 46.7 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… (2 KB at 40.1 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 43.8 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (2 KB at 46.7 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 51.9 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… (2 KB at 46.7 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 59.7 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… (2 KB at 55.6 KB/sec) mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target> [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- mojoSucceeded org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) mojoStarted org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-ui-swing --- mojoSucceeded org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) mojoStarted org.nuiton.jaxx:jaxx-maven-plugin:2.5.18-SNAPSHOT(default) [INFO] [INFO] --- jaxx-maven-plugin:2.5.18-SNAPSHOT:generate (default) @ tutti-ui-swing --- Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 50.1 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (2 KB at 52.0 KB/sec) [INFO] use project compile scope class-path [INFO] Detects 40 modified jaxx file(s). [INFO] Generated 40 file(s) in 22.947s mojoSucceeded org.nuiton.jaxx:jaxx-maven-plugin:2.5.18-SNAPSHOT(default) mojoStarted org.nuiton.jaxx:jaxx-maven-plugin:2.5.18-SNAPSHOT(default) [INFO] [INFO] --- jaxx-maven-plugin:2.5.18-SNAPSHOT:generate-help-ids (default) @ tutti-ui-swing --- [INFO] Store detected help ids to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/gene…> [INFO] Merge help ids to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/gene…> [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/main/fi…> [INFO] No keys to add. [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/main/fi…> [INFO] No keys to add. mojoSucceeded org.nuiton.jaxx:jaxx-maven-plugin:2.5.18-SNAPSHOT(default) mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:parserJava (scan-sources) @ tutti-ui-swing --- mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:parserValidation (scan-sources) @ tutti-ui-swing --- [INFO] Load rules file validation.rules mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) forkedProjectStarted fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(get) [INFO] [INFO] --- i18n-maven-plugin:2.5:get (get) @ tutti-ui-swing --- [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/gene…> [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/gene…> mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(get) forkedProjectSucceeded fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:gen (scan-sources) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 1/1141 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 1155/1155 empty entries! (use -Di18n.showEmpty to see these entries) mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) forkedProjectStarted fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(collect-i18n-artifacts) [INFO] [INFO] --- i18n-maven-plugin:2.5:collect-i18n-artifacts (collect-i18n-artifacts) @ tutti-ui-swing --- [INFO] collected 11 i18n artifacts for locale fr_FR stored in <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/i18n…> mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(collect-i18n-artifacts)[INFO] collected 11 i18n artifacts for locale en_GB stored in <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/i18n…> forkedProjectSucceeded fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(make-bundle) [WARNING] bundle fr_FR contains 2/1448 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- i18n-maven-plugin:2.5:bundle (make-bundle) @ tutti-ui-swing --- [WARNING] bundle en_GB contains 1301/1461 empty entries! (use -Di18n.showEmpty to see these entries) mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(make-bundle) mojoStarted org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses) [INFO] [INFO] --- license-maven-plugin:1.4:update-project-license (attach-licenses) @ tutti-ui-swing --- mojoSucceeded org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses) mojoStarted org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses) [INFO] [INFO] --- license-maven-plugin:1.4:add-third-party (attach-licenses) @ tutti-ui-swing --- Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/andromda-c… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/andro… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/andromda-u… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/andro… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/metafacade… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/metaf… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/translatio… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/trans… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/translatio… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/trans… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… [WARNING] No license name defined for org.hibernate.javax.persistence--hibernate-jpa-2.0-api--1.0.1.Final [INFO] Load missing file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/license…> [INFO] Missing file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/license…> is up-to-date. [INFO] Writing third-party file to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/gene…> [INFO] Writing bundled third-party file to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/gene…> [INFO] Will attach third party file from <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/license…> mojoSucceeded org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses) mojoStarted org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 4 resources [INFO] Copying 90 resources [INFO] Copying 4 resources [INFO] Copying 4 resources mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) mojoStarted org.apache.maven.plugins:maven-compiler-plugin:2.5.1(default-compile) [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-ui-swing --- [INFO] Compiling 295 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/target/clas…> mojoFailed org.apache.maven.plugins:maven-compiler-plugin:2.5.1(default-compile)[INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/main/ja…>:[149,57] error: cannot find symbol [INFO] 1 error [INFO] ------------------------------------------------------------- projectFailed fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT sessionEnded [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [6.796s] [INFO] Tutti :: Persistence .............................. SUCCESS [21.078s] [INFO] Tutti :: Service .................................. SUCCESS [9.812s] [INFO] Tutti :: UI ....................................... FAILURE [37.515s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 1:16.756s [INFO] Finished at: Mon Apr 22 15:47:49 CEST 2013 [INFO] Final Memory: 68M/203M [INFO] ------------------------------------------------------------------------ Projects to build: [MavenProject: fr.ifremer:tutti:2.0-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/pom.xml,> MavenProject: fr.ifremer.tutti:tutti-persistence:2.0-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/pom.xml,> MavenProject: fr.ifremer.tutti:tutti-service:2.0-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/pom.xml,> MavenProject: fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/pom.xml]> [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-04-22_15-46-28/archive/fr.ifremer.tutti/tutti-service/2.0-SNAPSHOT/tutti-service-2.0-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-service/target/tutti…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-04-22_15-46-28/archive/fr.ifremer.tutti/tutti-service/2.0-SNAPSHOT/tutti-service-2.0-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-ui-swing/builds/2013-04-22_15-46-28/archive/fr.ifremer.tutti/tutti-ui-swing/2.0-SNAPSHOT/tutti-ui-swing-2.0-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/license…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-ui-swing/builds/2013-04-22_15-46-28/archive/fr.ifremer.tutti/tutti-ui-swing/2.0-SNAPSHOT/tutti-ui-swing-2.0-SNAPSHOT-third-party.properties [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-04-22_15-46-28/archive/fr.ifremer/tutti/2.0-SNAPSHOT/tutti-2.0-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/target/tutti-2.0-SNAPSHOT-…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-04-22_15-46-28/archive/fr.ifremer/tutti/2.0-SNAPSHOT/tutti-2.0-SNAPSHOT-site_fr.xml [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-04-22_15-46-28/archive/fr.ifremer.tutti/tutti-persistence/2.0-SNAPSHOT/tutti-persistence-2.0-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-persistence/target/t…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-04-22_15-46-28/archive/fr.ifremer.tutti/tutti-persistence/2.0-SNAPSHOT/tutti-persistence-2.0-SNAPSHOT.jar Waiting for Jenkins to finish collecting data mavenExecutionResult exceptions not empty message : Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project tutti-ui-swing: Compilation failure bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/main/ja…>:[149,57] error: cannot find symbol cause : Compilation failure bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/main/ja…>:[149,57] error: cannot find symbol Stack trace : org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project tutti-ui-swing: Compilation failure bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/main/ja…>:[149,57] error: cannot find symbol at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:79) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:329) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) at java.lang.Thread.run(Thread.java:722) Caused by: org.apache.maven.plugin.CompilationFailureException: Compilation failure bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk2/tutti-ui-swing/src/main/ja…>:[149,57] error: cannot find symbol at org.apache.maven.plugin.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:729) at org.apache.maven.plugin.CompilerMojo.execute(CompilerMojo.java:128) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209) ... 27 more Sending e-mails to: tutti-commits(a)list.forge.codelutin.com kmorin(a)codelutin.com chemit(a)codelutin.com channel stopped

1 1

Build failed in Jenkins: tutti » Tutti :: UI #695
by admin+hudson＠codelutin.com April 22, 2013

April 22, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/695/…> Changes: [Kevin Morin] fixes #1987 [PROTOCOLE] - Gestion des contrôles/infos obligatoires en validation [Tony Chemit] refs #1875: [IMP/EXP] - Export des données de campagne : format générique (desactivation pour le moment des actions + deplacement de la configuration dans le module service) [Tony Chemit] fixes #2345: [CAPTURES] Muavaise remonté des arbres d'échantillonage ------------------------------------------ projectStarted fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 2.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 39.1 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… (2 KB at 35.2 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/2.… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/2.5.18-… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/2.… (808 B at 25.5 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/2.5.18-… (808 B at 24.7 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 46.7 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… (2 KB at 40.1 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 43.8 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (2 KB at 46.7 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 51.9 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… (2 KB at 46.7 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 59.7 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… (2 KB at 55.6 KB/sec) mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- mojoSucceeded org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) mojoStarted org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-ui-swing --- mojoSucceeded org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) mojoStarted org.nuiton.jaxx:jaxx-maven-plugin:2.5.18-SNAPSHOT(default) [INFO] [INFO] --- jaxx-maven-plugin:2.5.18-SNAPSHOT:generate (default) @ tutti-ui-swing --- Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 50.1 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (2 KB at 52.0 KB/sec) [INFO] use project compile scope class-path [INFO] Detects 40 modified jaxx file(s). [INFO] Generated 40 file(s) in 22.947s mojoSucceeded org.nuiton.jaxx:jaxx-maven-plugin:2.5.18-SNAPSHOT(default) mojoStarted org.nuiton.jaxx:jaxx-maven-plugin:2.5.18-SNAPSHOT(default) [INFO] [INFO] --- jaxx-maven-plugin:2.5.18-SNAPSHOT:generate-help-ids (default) @ tutti-ui-swing --- [INFO] Store detected help ids to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Merge help ids to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] No keys to add. [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] No keys to add. mojoSucceeded org.nuiton.jaxx:jaxx-maven-plugin:2.5.18-SNAPSHOT(default) mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:parserJava (scan-sources) @ tutti-ui-swing --- mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:parserValidation (scan-sources) @ tutti-ui-swing --- [INFO] Load rules file validation.rules mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) forkedProjectStarted fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(get) [INFO] [INFO] --- i18n-maven-plugin:2.5:get (get) @ tutti-ui-swing --- [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(get) forkedProjectSucceeded fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:gen (scan-sources) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 1/1141 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 1155/1155 empty entries! (use -Di18n.showEmpty to see these entries) mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) forkedProjectStarted fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(collect-i18n-artifacts) [INFO] [INFO] --- i18n-maven-plugin:2.5:collect-i18n-artifacts (collect-i18n-artifacts) @ tutti-ui-swing --- [INFO] collected 11 i18n artifacts for locale fr_FR stored in <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(collect-i18n-artifacts)[INFO] collected 11 i18n artifacts for locale en_GB stored in <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> forkedProjectSucceeded fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(make-bundle) [WARNING] bundle fr_FR contains 2/1448 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- i18n-maven-plugin:2.5:bundle (make-bundle) @ tutti-ui-swing --- [WARNING] bundle en_GB contains 1301/1461 empty entries! (use -Di18n.showEmpty to see these entries) mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(make-bundle) mojoStarted org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses) [INFO] [INFO] --- license-maven-plugin:1.4:update-project-license (attach-licenses) @ tutti-ui-swing --- mojoSucceeded org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses) mojoStarted org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses) [INFO] [INFO] --- license-maven-plugin:1.4:add-third-party (attach-licenses) @ tutti-ui-swing --- Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/profiles/e… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/profi… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/andromda-c… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/andro… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/andromda-u… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/andro… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/metafacade… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/metaf… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/translatio… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/trans… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/translatio… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/trans… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/andromda/cartridges… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/andromda/cartr… [WARNING] No license name defined for org.hibernate.javax.persistence--hibernate-jpa-2.0-api--1.0.1.Final [INFO] Load missing file <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] Missing file <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> is up-to-date. [INFO] Writing third-party file to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Writing bundled third-party file to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Will attach third party file from <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> mojoSucceeded org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses) mojoStarted org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 4 resources [INFO] Copying 90 resources [INFO] Copying 4 resources [INFO] Copying 4 resources mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) mojoStarted org.apache.maven.plugins:maven-compiler-plugin:2.5.1(default-compile) [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-ui-swing --- [INFO] Compiling 295 source files to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> mojoFailed org.apache.maven.plugins:maven-compiler-plugin:2.5.1(default-compile)[INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>:[149,57] error: cannot find symbol [INFO] 1 error [INFO] ------------------------------------------------------------- projectFailed fr.ifremer.tutti:tutti-ui-swing:2.0-SNAPSHOT

1 1

r854 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config
by tchemit＠users.forge.codelutin.com April 22, 2013

April 22, 2013

Author: tchemit Date: 2013-04-22 15:54:29 +0200 (Mon, 22 Apr 2013) New Revision: 854 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/854 Log: fix build Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-04-22 13:45:11 UTC (rev 853) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-04-22 13:54:29 UTC (rev 854) @@ -146,7 +146,7 @@ SampleOrderIdsTableCell comp = new SampleOrderIdsTableCell(context); TableCellEditor sampleOrderEditor = comp.getNewTableCellEditor(); - helper.addOption(TuttiApplicationConfigOption.SAMPLING_CATEGORY_ORDER_IDS) + helper.addOption(TuttiServiceConfigOption.SAMPLING_CATEGORY_ORDER_IDS) .setOptionEditor(sampleOrderEditor) .setOptionRenderer(comp.getNewTableCellRenderer()); }

1 0