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

r1341 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data tutti-service/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 10 Nov '13

10 Nov '13

Author: tchemit Date: 2013-11-10 13:25:46 +0100 (Sun, 10 Nov 2013) New Revision: 1341 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1341 Log: fixes #3741: [OPERATION] une erreur ?\195?\160 analyser Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-error-validation.xml trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.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/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java 2013-11-08 16:59:13 UTC (rev 1340) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/AbstractPersistenceService.java 2013-11-10 12:25:46 UTC (rev 1341) @@ -284,7 +284,7 @@ if (uiValue == null) { Preconditions.checkState( - defaultNotEmptyDate == null, + defaultNotEmptyDate != null, "'defaultNotEmptyDate' could not be null."); Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-error-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-error-validation.xml 2013-11-08 16:59:13 UTC (rev 1340) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-edit-error-validation.xml 2013-11-10 12:25:46 UTC (rev 1341) @@ -49,6 +49,27 @@ <message>tutti.validator.error.fishingOperation.dates.endBeforeStart</message> </field-validator> + + <field-validator type="skipablefieldexpression" short-circuit="true"> + <param name="skip"> + <![CDATA[ gearShootingEndDate == null || gearShootingStartDate == null || gearShootingStartLatitude == null || gearShootingStartLongitude == null || gearShootingEndLatitude == null || gearShootingEndLongitude == null || !gearShootingStartDate.equals(gearShootingEndDate)]]> + </param> + <param name="expression"> + <![CDATA[ (gearShootingStartLatitude.equals(gearShootingEndLatitude) && gearShootingStartLongitude.equals(gearShootingEndLongitude)) ]]> + </param> + <message>tutti.validator.error.fishingOperation.invalid.dates.for.position</message> + </field-validator> + + <field-validator type="skipablefieldexpression" short-circuit="true"> + <param name="skip"> + <![CDATA[ gearShootingEndDate == null || gearShootingStartDate == null || gearShootingStartLatitude == null || gearShootingStartLongitude == null || gearShootingEndLatitude == null || gearShootingEndLongitude == null || !(gearShootingStartLatitude.equals(gearShootingEndLatitude) && gearShootingStartLongitude.equals(gearShootingEndLongitude))]]> + </param> + <param name="expression"> + <![CDATA[ gearShootingStartDate.equals(gearShootingEndDate) ]]> + </param> + <message>tutti.validator.error.fishingOperation.invalid.position.for.dates</message> + </field-validator> + </field> <field name="comment"> Modified: trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml =================================================================== --- trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml 2013-11-08 16:59:13 UTC (rev 1340) +++ trunk/tutti-service/src/main/resources/fr/ifremer/tutti/persistence/entities/data/FishingOperation-validate-error-validation.xml 2013-11-10 12:25:46 UTC (rev 1341) @@ -93,6 +93,26 @@ <message>tutti.validator.error.fishingOperation.dates.startOutOfCruiseDates</message> </field-validator> + <field-validator type="skipablefieldexpression" short-circuit="true"> + <param name="skip"> + <![CDATA[ gearShootingEndDate == null || gearShootingStartDate == null || gearShootingStartLatitude == null || gearShootingStartLongitude == null || gearShootingEndLatitude == null || gearShootingEndLongitude == null || !gearShootingStartDate.equals(gearShootingEndDate)]]> + </param> + <param name="expression"> + <![CDATA[ (gearShootingStartLatitude.equals(gearShootingEndLatitude) && gearShootingStartLongitude.equals(gearShootingEndLongitude)) ]]> + </param> + <message>tutti.validator.error.fishingOperation.invalid.dates.for.position</message> + </field-validator> + + <field-validator type="skipablefieldexpression" short-circuit="true"> + <param name="skip"> + <![CDATA[ gearShootingEndDate == null || gearShootingStartDate == null || gearShootingStartLatitude == null || gearShootingStartLongitude == null || gearShootingEndLatitude == null || gearShootingEndLongitude == null || !(gearShootingStartLatitude.equals(gearShootingEndLatitude) && gearShootingStartLongitude.equals(gearShootingEndLongitude))]]> + </param> + <param name="expression"> + <![CDATA[ gearShootingStartDate.equals(gearShootingEndDate) ]]> + </param> + <message>tutti.validator.error.fishingOperation.invalid.position.for.dates</message> + </field-validator> + </field>  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-11-08 16:59:13 UTC (rev 1340) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-11-10 12:25:46 UTC (rev 1341) @@ -205,6 +205,8 @@ tutti.validator.error.fishingOperation.fishingOperationNumber.required= tutti.validator.error.fishingOperation.fishingOperationValid.required= tutti.validator.error.fishingOperation.gear.required= +tutti.validator.error.fishingOperation.invalid.dates.for.position= +tutti.validator.error.fishingOperation.invalid.position.for.dates= tutti.validator.error.fishingOperation.stationNumber.required= tutti.validator.error.fishingOperation.stationNumber.too.long= tutti.validator.error.fishingOperation.strataLocation.required= 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-11-08 16:59:13 UTC (rev 1340) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-11-10 12:25:46 UTC (rev 1341) @@ -205,6 +205,8 @@ tutti.validator.error.fishingOperation.fishingOperationNumber.required=Le numéro de trait est obligatoire tutti.validator.error.fishingOperation.fishingOperationValid.required=La validité du trait est obligatoire tutti.validator.error.fishingOperation.gear.required=L'engin est obligatoire +tutti.validator.error.fishingOperation.invalid.dates.for.position=Les dates ne peuvent pas être identiques si les positions sont différentes +tutti.validator.error.fishingOperation.invalid.position.for.dates=Si les positions sont identiques, les dates ne peuvent être identiques tutti.validator.error.fishingOperation.stationNumber.required=Le numéro de station est obligatoire tutti.validator.error.fishingOperation.stationNumber.too.long=Valeur trop longue (limitée à %s caractères) tutti.validator.error.fishingOperation.strataLocation.required=La strate, sous-strate ou localité doit être renseignée

1 0

r1340 - trunk/src/conception/specifications
by lkaufmann＠users.forge.codelutin.com 08 Nov '13

08 Nov '13

Author: lkaufmann Date: 2013-11-08 17:59:13 +0100 (Fri, 08 Nov 2013) New Revision: 1340 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1340 Log: Specifications v0.2 update Modified: trunk/src/conception/specifications/AllegroCampagne-Specifications.odt trunk/src/conception/specifications/AllegroCampagne-Specifications.pdf Modified: trunk/src/conception/specifications/AllegroCampagne-Specifications.odt =================================================================== (Binary files differ) Modified: trunk/src/conception/specifications/AllegroCampagne-Specifications.pdf =================================================================== (Binary files differ)

1 0

r1339 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches
by tchemit＠users.forge.codelutin.com 08 Nov '13

08 Nov '13

Author: tchemit Date: 2013-11-08 15:34:28 +0100 (Fri, 08 Nov 2013) New Revision: 1339 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1339 Log: fixes #3740: [CAPTURE] le bouton pi?\195?\168ces jointe dans l'onglet r?\195?\169sum?\195?\169 n'est plus accessible Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-11-08 14:21:55 UTC (rev 1338) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-11-08 14:34:28 UTC (rev 1339) @@ -238,6 +238,9 @@ super.fromEntity(entity); + // id was bind to #id but not to editObject#id + editObject.setId(getId()); + firePropertyChange(PROPERTY_CATCH_BATCH, null, entity); firePropertyChange(PROPERTY_OBJECT_ID, oldObjectId, getObjectId());

1 0

r1338 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol
by tchemit＠users.forge.codelutin.com 08 Nov '13

08 Nov '13

Author: tchemit Date: 2013-11-08 15:21:55 +0100 (Fri, 08 Nov 2013) New Revision: 1338 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1338 Log: fixes #3739: [PROTOCOLE] la suppression d'une ligne dans le tableau esp?\195?\168ces du protocole ne fonctionne pas (?\195?\167a marche pour le benthos) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java 2013-11-08 14:03:08 UTC (rev 1337) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/RemoveSpeciesProtocolAction.java 2013-11-08 14:21:55 UTC (rev 1338) @@ -115,10 +115,10 @@ getUI().getSpeciesComboBox().addItems(removedSpecies); // remove all rows from model - getModel().getBenthosRow().removeAll(removedRows); + getModel().getSpeciesRow().removeAll(removedRows); // fire table data changed - handler.getBenthosTableModel().fireTableDataChanged(); + handler.getSpeciesTableModel().fireTableDataChanged(); // clear table selection handler.getSpeciesTable().clearSelection();

1 0

r1337 - in trunk: . tutti-service/src/main/java/fr/ifremer/tutti/service tutti-service/src/main/java/fr/ifremer/tutti/service/protocol tutti-service/src/main/resources/i18n tutti-service/src/test/java/fr/ifremer/tutti/service/protocol tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 08 Nov '13

08 Nov '13

Author: tchemit Date: 2013-11-08 15:03:08 +0100 (Fri, 08 Nov 2013) New Revision: 1337 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1337 Log: fixes #3688: [PROTOCOLE] probleme import toutes les carct?\195?\169ristiques : ?\195?\167a marche pas Modified: trunk/README.txt trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2013-11-08 14:02:36 UTC (rev 1336) +++ trunk/README.txt 2013-11-08 14:03:08 UTC (rev 1337) @@ -26,5 +26,5 @@ +---------------------+------------+---------------------------+ + 2.4 + 2013.06.04 + 3.2.3 + +---------------------+------------+---------------------------+ -+ 2.5 + 2013.08.22 + 3.2.3 + ++ 2.8.1 + 2013.08.22 + 3.2.3 + +---------------------+------------+---------------------------+ Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-11-08 14:02:36 UTC (rev 1336) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/TuttiCsvUtil.java 2013-11-08 14:03:08 UTC (rev 1337) @@ -27,7 +27,6 @@ import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.Lists; -import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.entities.TuttiEntity; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Gear; @@ -40,6 +39,7 @@ import org.nuiton.csv.Common; import org.nuiton.csv.ExportModel; import org.nuiton.csv.ExportableColumn; +import org.nuiton.csv.ImportRuntimeException; import org.nuiton.csv.ValueFormatter; import org.nuiton.csv.ValueGetter; import org.nuiton.csv.ValueParserFormatter; @@ -47,7 +47,6 @@ import org.nuiton.csv.ext.AbstractImportExportModel; import org.nuiton.csv.ext.RepeatableExport; import org.nuiton.decorator.Decorator; -import org.nuiton.decorator.DecoratorUtil; import java.io.Serializable; import java.io.Writer; @@ -274,7 +273,7 @@ if (result == null) { // can not find entity this is a big problem for us... - throw new TuttiTechnicalException(_("tutti.service.csv.parse.entityNotFound", entityType.getSimpleName(), propertyName, value)); + throw new ImportRuntimeException(_("tutti.service.csv.parse.entityNotFound", entityType.getSimpleName(), propertyName, value)); } } return result; @@ -386,7 +385,7 @@ if (existingValues.contains(value)) { // entity already defined - throw new TuttiTechnicalException(_(errorMessage, propertyName, value)); + throw new ImportRuntimeException(_(errorMessage, propertyName, value)); } } return value; @@ -444,7 +443,7 @@ try { return (String) BeanUtilsBean.getInstance().getPropertyUtils().getNestedProperty(value, propertyName); } catch (Exception e) { - throw new TuttiTechnicalException(_("tutti.service.cvs.format.error"), e);//"Could not format value" + throw new ImportRuntimeException(_("tutti.service.cvs.format.error"), e);//"Could not format value" } } } @@ -473,7 +472,7 @@ try { return decorator.toString(value); } catch (Exception e) { - throw new TuttiTechnicalException(_("tutti.service.cvs.format.error", value), e); + throw new ImportRuntimeException(_("tutti.service.cvs.format.error", value), e); } } } @@ -494,6 +493,46 @@ } } + public static <E extends Enum<E>> ValueParserFormatter<E> newEnumByNameParserFormatter(Class<E> enumType, boolean mandatory) { + return new EnumByNameParserFormatter<E>(enumType, mandatory); + } + + public static class EnumByNameParserFormatter<E extends Enum<E>> implements ValueParserFormatter<E> { + + + private final Class<E> enumType; + + private final boolean mandatory; + + public EnumByNameParserFormatter(Class<E> enumType, boolean mandatory) { + this.enumType = enumType; + this.mandatory = mandatory; + } + + @Override + public E parse(String value) throws ParseException { + E result; + if (StringUtils.isBlank(value)) { + result = null; + } else { + result = Enum.valueOf(enumType, value); + } + if (mandatory && result == null) { + throw new NullPointerException(_("tutti.service.cvs.mandatory.value")); + } + return result; + } + + @Override + public String format(E date) { + String value = ""; + if (date != null) { + value = date.name(); + } + return value; + } + } + protected static class CaracteristicValueFormatter implements ValueFormatter<Serializable> { ValueParserFormatter<Integer> integerDelegate = INTEGER; Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java 2013-11-08 14:02:36 UTC (rev 1336) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/CaracteristicRowModel.java 2013-11-08 14:03:08 UTC (rev 1337) @@ -52,7 +52,7 @@ newMandatoryColumn(CaracteristicRow.PROPERTY_PMFM_TYPE, CaracteristicRow.PROPERTY_PMFM_TYPE, - Common.newEnumByNameParserFormatter(CaracteristicType.class)); + TuttiCsvUtil.newEnumByNameParserFormatter(CaracteristicType.class, true)); newIgnoredColumn(CaracteristicRow.PROPERTY_PMFM_PARAMETER_NAME); newIgnoredColumn(CaracteristicRow.PROPERTY_PMFM_MATRIX_NAME); @@ -62,7 +62,7 @@ // export definition newColumnForExport(CaracteristicRow.PROPERTY_PMFM_ID); - newColumnForExport(CaracteristicRow.PROPERTY_PMFM_TYPE, Common.newEnumByNameParserFormatter(CaracteristicType.class)); + newColumnForExport(CaracteristicRow.PROPERTY_PMFM_TYPE, TuttiCsvUtil.newEnumByNameParserFormatter(CaracteristicType.class, true)); newColumnForExport(CaracteristicRow.PROPERTY_PMFM_PARAMETER_NAME); newColumnForExport(CaracteristicRow.PROPERTY_PMFM_MATRIX_NAME); newColumnForExport(CaracteristicRow.PROPERTY_PMFM_FRACTION_NAME); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2013-11-08 14:02:36 UTC (rev 1336) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportService.java 2013-11-08 14:03:08 UTC (rev 1337) @@ -130,8 +130,10 @@ IOUtils.closeQuietly(importer); } reader.close(); + } catch (ImportRuntimeException e) { + throw e; } catch (Exception e) { - throw new IOException("Could not import protocol [" + protocol.getName() + "] caracteristic from file " + file, e); + throw new ImportRuntimeException("Could not import protocol [" + protocol.getName() + "] caracteristic from file " + file, e); } finally { IOUtils.closeQuietly(reader); @@ -175,7 +177,7 @@ export.write(writer); writer.close(); } catch (Exception e) { - throw new TuttiTechnicalException(_("tutti.service.protocol.export.caracteristics.all.error", file), e); + throw new ImportRuntimeException(_("tutti.service.protocol.export.caracteristics.all.error", file), e); } finally { IOUtils.closeQuietly(writer); } @@ -286,14 +288,7 @@ reader.close(); } catch (ImportRuntimeException e) { - String message; - if (e.getCause() != null) { - message = e.getCause().getMessage(); - } else { - message = e.getMessage(); - } - throw new TuttiTechnicalException(message, e); - + throw e; } catch (Exception e) { throw new TuttiTechnicalException(_("tutti.service.protocol.import.species.error", protocol.getName(), file), e); @@ -362,7 +357,9 @@ IOUtils.closeQuietly(importer); } reader.close(); - } catch (Exception e) { + } catch (ImportRuntimeException e) { + throw e; + }catch (Exception e) { throw new TuttiTechnicalException(_("tutti.service.protocol.import.benthos.error", protocol.getName(), file), e); } finally { IOUtils.closeQuietly(reader); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-11-08 14:02:36 UTC (rev 1336) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-11-08 14:03:08 UTC (rev 1337) @@ -30,6 +30,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.TuttiCsvUtil; import org.nuiton.csv.Common; +import org.nuiton.csv.ImportRuntimeException; import java.text.ParseException; import java.util.Map; @@ -66,7 +67,7 @@ if (taxonIds.contains(referenceTaxonId)) { // duplicate reference taxon id used - throw new TuttiTechnicalException(_("tutti.service.protocol.import.taxonUsed.error", referenceTaxonId)); + throw new ImportRuntimeException(_("tutti.service.protocol.import.taxonUsed.error", referenceTaxonId)); } taxonIds.add(referenceTaxonId); return species; 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-11-08 14:02:36 UTC (rev 1336) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-11-08 14:03:08 UTC (rev 1337) @@ -66,6 +66,7 @@ tutti.service.context.serviceInstanciation.error= tutti.service.csv.parse.entityNotFound= tutti.service.cvs.format.error= +tutti.service.cvs.mandatory.value= tutti.service.export.catches.error= tutti.service.export.closeContext.error= tutti.service.export.context.error= 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-11-08 14:02:36 UTC (rev 1336) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-11-08 14:03:08 UTC (rev 1337) @@ -66,6 +66,7 @@ tutti.service.context.serviceInstanciation.error=Erreur lors de l'instanciation du service %s tutti.service.csv.parse.entityNotFound=L'entité de type %1s avec la propriété %2s de valeur %3s n'a pas été trouvée tutti.service.cvs.format.error=Erreur lors du formatage de la valeur %s +tutti.service.cvs.mandatory.value=Valeur obligatoire tutti.service.export.catches.error=Erreur lors de l'export des captures tutti.service.export.closeContext.error=Erreur lors de la fermeture du contexte d'export tutti.service.export.context.error=Erreur lors de la création des fichiers pour l'export Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java 2013-11-08 14:02:36 UTC (rev 1336) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/ProtocolImportExportServiceTest.java 2013-11-08 14:03:08 UTC (rev 1337) @@ -41,6 +41,7 @@ import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; +import org.nuiton.csv.ImportRuntimeException; import java.io.File; import java.util.Map; @@ -135,6 +136,12 @@ "2;VESSEL_USE_FEATURE;parameterName2;matrixName2;fractionName2;methodName2;\n" + "3;GEAR_USE_FEATURE;parameterName3;matrixName3;fractionName3;methodName3;"; + public static final String PROTOCOL_CARACTERISTIC_FILE_BAD_CONTENT = + "pmfmId;pmfmType;pmfmParameterName;pmfmMatrixName;pmfmFractionName;pmfmMethodName\n" + + "1;LENGTH_STEP;parameterName1;matrixName1;fractionName1;methodName1;\n" + + "2;;parameterName2;matrixName2;fractionName2;methodName2;\n" + + "3;GEAR_USE_FEATURE;parameterName3;matrixName3;fractionName3;methodName3;"; + public static final String ALL_CARACTERISTIC_FILE_CONTENT = "pmfmId;pmfmType;pmfmParameterName;pmfmMatrixName;pmfmFractionName;pmfmMethodName\n" + "1;;parameterName1;matrixName1;fractionName1;methodName1;\n" + @@ -347,6 +354,22 @@ protocol.getGearUseFeaturePmfmId()); } + @Test(expected = ImportRuntimeException.class) + public void importProtocolCaracteristicMissingCaracteristicType() throws Exception { + + File file = new File(datadirectory, "importProtocolCaracteristicMissingCaracteristicType.csv"); + + Files.createParentDirs(file); + + Files.write(PROTOCOL_CARACTERISTIC_FILE_BAD_CONTENT, file, Charsets.UTF_8); + + TuttiProtocol protocol = TuttiProtocols.newTuttiProtocol(); + Map<String, Caracteristic> caracteristicMap = createCaracteristics(); + + service.importProtocolCaracteristic(file, + protocol, + caracteristicMap); + } @Test public void exportProtocolCaracteristic() throws Exception { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-11-08 14:02:36 UTC (rev 1336) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiErrorHelper.java 2013-11-08 14:03:08 UTC (rev 1337) @@ -29,6 +29,7 @@ import org.jdesktop.swingx.JXErrorPane; import org.jdesktop.swingx.error.ErrorInfo; import org.jdesktop.swingx.error.ErrorReporter; +import org.nuiton.csv.ImportRuntimeException; import javax.swing.JOptionPane; @@ -64,6 +65,10 @@ JOptionPane.showMessageDialog(context.getMainUI(), "<html><body>" + cause.getMessage() + "</body></html>", _("tutti.error.ui.business.error"), JOptionPane.ERROR_MESSAGE); + } else if (cause instanceof ImportRuntimeException) { + JOptionPane.showMessageDialog(context.getMainUI(), cause.getMessage(), + _("tutti.error.ui.business.error"), + JOptionPane.ERROR_MESSAGE); } else { JXErrorPane pane = new JXErrorPane(); 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-11-08 14:02:36 UTC (rev 1336) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-11-08 14:03:08 UTC (rev 1337) @@ -886,9 +886,9 @@ tutti.editProtocol.action.closeEditProtocol=Fermer tutti.editProtocol.action.closeEditProtocol.mnemonic=F tutti.editProtocol.action.closeEditProtocol.tip=Fermer l'écran d'édition du protocole -tutti.editProtocol.action.exportProtocolAllCaracteristic=Exporter toutes les caractéristiques +tutti.editProtocol.action.exportProtocolAllCaracteristic=Exporter toutes les caractéristiques du référentiel tutti.editProtocol.action.exportProtocolAllCaracteristic.mnemonic=t -tutti.editProtocol.action.exportProtocolAllCaracteristic.tip=Exporter toutes les caractéristiques (sans les affecter à un écran) +tutti.editProtocol.action.exportProtocolAllCaracteristic.tip=Exporter toutes les caractéristiques du référentiel (sans les affecter à un écran) tutti.editProtocol.action.exportProtocolBenthos=Exporter les espèces du benthos tutti.editProtocol.action.exportProtocolBenthos.mnemonic=b tutti.editProtocol.action.exportProtocolBenthos.tip=Exporter les espèce du benthos du protocole

1 0

r1336 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol
by tchemit＠users.forge.codelutin.com 08 Nov '13

08 Nov '13

Author: tchemit Date: 2013-11-08 15:02:36 +0100 (Fri, 08 Nov 2013) New Revision: 1336 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1336 Log: fixes #3747: [PROTOCOLE] probleme Ajout esp?\195?\168ce 1545 GADIARG Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java 2013-11-05 13:52:00 UTC (rev 1335) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/AddSpeciesProtocolAction.java 2013-11-08 14:02:36 UTC (rev 1336) @@ -91,7 +91,7 @@ // select this new row int rowIndex = tableModel.getRowIndex(newRow); - SwingUtil.setSelectionInterval(handler.getBenthosTable(), rowIndex); + SwingUtil.setSelectionInterval(handler.getSpeciesTable(), rowIndex); // add notification String speciesStr = decorate(species);

1 0

Build failed in Jenkins: tutti #1105
by admin+hudson＠codelutin.com 05 Nov '13

05 Nov '13

See <http://ci.nuiton.org/jenkins/job/tutti/1105/changes> Changes: [Tony Chemit] fixes #3674: [CAMPAGNE] pouvoir ajouter plusieur engins professionnels de même type à une campagne ------------------------------------------ Started by an SCM change Building on master in workspace <http://ci.nuiton.org/jenkins/job/tutti/ws/> Updating https://forge.codelutin.com/svn/tutti/trunk at revision '2013-11-05T01:55:59.368 +0100' U tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/SaveCruiseAction.java G tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties U tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties U tutti-ui-swing/src/license/THIRD-PARTY.properties U tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceService.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrders.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/GearWithOriginalRankOrderBean.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/TuttiEntities.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java At revision 1326 Parsing POMs [trunk] $ /opt/jdk/bin/java -Xmx256m -XX:-UseGCOverheadLimit -cp /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven31-agent-1.4.jar:/opt/maven3/boot/plexus-classworlds-2.5.1.jar:/opt/maven3/conf/logging jenkins.maven3.agent.Maven31Main /opt/maven3 /opt/repository/apache-tomcat-7.0.47/webapps/jenkins/WEB-INF/lib/remoting-2.32.jar /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven31-interceptor-1.4.jar /var/local/jenkins/data/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-commons-1.4.jar 58337 <===[JENKINS REMOTING CAPACITY]===> channel started log4j:WARN No appenders could be found for logger (org.apache.commons.beanutils.converters.BooleanConverter). log4j:WARN Please initialize the log4j system properly. Executing Maven: -B -f <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/pom.xml> -U -e clean install [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Reactor Build Order: [INFO] [INFO] Tutti [INFO] Tutti :: Persistence [INFO] Tutti :: Service [INFO] Tutti :: UI [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti 2.9-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ tutti --- [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ tutti --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/target/surefire-workdir> [INFO] Executed tasks [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ tutti --- [INFO] [INFO] --- maven-install-plugin:2.5:install (default-install) @ tutti --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/pom.xml> to /var/local/maven/data/repository/fr/ifremer/tutti/2.9-SNAPSHOT/tutti-2.9-SNAPSHOT.pom [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/target/tutti-2.9-SNAPSHOT-s…> to /var/local/maven/data/repository/fr/ifremer/tutti/2.9-SNAPSHOT/tutti-2.9-SNAPSHOT-site_fr.xml [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: Persistence 2.9-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-persistence --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ tutti-persistence --- [INFO] [INFO] --- eugene-maven-plugin:2.7.2:generate (default) @ tutti-persistence --- [INFO] Process phase [zargo] for one entry. [INFO] Expanding 1 xmi file(s) from <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/src/main/…> [INFO] Will generate <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…> [INFO] Copy file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/src/main/…> to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…> [INFO] Generate one file in 26.381ms. [INFO] Process phase [xmi] for one entry. [INFO] Processing XSL tranformation on <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…> for 1 file(s). [INFO] Will generate <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…> [INFO] Copy file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…> to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…> [INFO] Generate one file in 1.288s. [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one INFO [pool-1-thread-1] (AbstractObjectModelReader.java:270) loadModelProperties - 24 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…> [INFO] No file generated. [INFO] Apply generator JavaInterfaceTransformer INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.TuttiEntity], already found in class-path. [INFO] Apply generator SimpleJavaBeanTransformer INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.referential.GearWithOriginalRankOrder], already found in class-path. INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.referential.GearWithOriginalRankOrderBean], already found in class-path. INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.referential.GearWithOriginalRankOrders], already found in class-path. INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols], already found in class-path. [INFO] Apply generator JavaEnumerationTransformer INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum], already found in class-path. [INFO] Add compile source root : <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…> [INFO] Add resource root :Resource {targetPath: null, filtering: false, FileSet {directory: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…,> PatternSet [includes: {}, excludes: {**/*.java}]}} [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserJava (scan-sources) @ tutti-persistence --- [INFO] [INFO] >>> i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-persistence >>> [INFO] [INFO] --- i18n-maven-plugin:2.5.2:get (get) @ tutti-persistence --- [INFO] Copying tutti-persistence.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…> [INFO] Copying tutti-persistence.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…> [INFO] [INFO] <<< i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-persistence <<< [INFO] [INFO] --- i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-persistence --- [WARNING] bundle en_GB contains 59/59 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 9 resources [INFO] Copying 0 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ tutti-persistence --- [INFO] Compiling 184 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/cl…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/ge…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ tutti-persistence --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/su…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ tutti-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 5 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ tutti-persistence --- [INFO] Compiling 32 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/te…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] 1 warning [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/src/test/…>:[265,37] method saveCruise in interface fr.ifremer.tutti.persistence.service.CruisePersistenceService cannot be applied to given types; required: fr.ifremer.tutti.persistence.entities.data.Cruise,boolean,boolean found: fr.ifremer.tutti.persistence.entities.data.Cruise reason: actual and formal argument lists differ in length [INFO] 1 error [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [4.011s] [INFO] Tutti :: Persistence .............................. FAILURE [9.406s] [INFO] Tutti :: Service .................................. SKIPPED [INFO] Tutti :: UI ....................................... SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 16.020s [INFO] Finished at: Tue Nov 05 01:56:21 CET 2013 [INFO] Final Memory: 34M/232M [INFO] ------------------------------------------------------------------------ Waiting for Jenkins to finish collecting data [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile (default-testCompile) on project tutti-persistence: Compilation failure [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/src/test/…>:[265,37] method saveCruise in interface fr.ifremer.tutti.persistence.service.CruisePersistenceService cannot be applied to given types; [ERROR] required: fr.ifremer.tutti.persistence.entities.data.Cruise,boolean,boolean [ERROR] found: fr.ifremer.tutti.persistence.entities.data.Cruise [ERROR] reason: actual and formal argument lists differ in length [ERROR] -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.1:testCompile (default-testCompile) on project tutti-persistence: Compilation failure <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/src/test/…>:[265,37] method saveCruise in interface fr.ifremer.tutti.persistence.service.CruisePersistenceService cannot be applied to given types; required: fr.ifremer.tutti.persistence.entities.data.Cruise,boolean,boolean found: fr.ifremer.tutti.persistence.entities.data.Cruise reason: actual and formal argument lists differ in length at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:212) 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:317) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:152) at org.jvnet.hudson.maven3.launcher.Maven31Launcher.main(Maven31Launcher.java:132) 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:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:330) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:238) at jenkins.maven3.agent.Maven31Main.launch(Maven31Main.java:181) 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:606) at hudson.maven.Maven3Builder.call(Maven3Builder.java:134) at hudson.maven.Maven3Builder.call(Maven3Builder.java:69) 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.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:744) Caused by: org.apache.maven.plugin.compiler.CompilationFailureException: Compilation failure <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/src/test/…>:[265,37] method saveCruise in interface fr.ifremer.tutti.persistence.service.CruisePersistenceService cannot be applied to given types; required: fr.ifremer.tutti.persistence.entities.data.Cruise,boolean,boolean found: fr.ifremer.tutti.persistence.entities.data.Cruise reason: actual and formal argument lists differ in length at org.apache.maven.plugin.compiler.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:858) at org.apache.maven.plugin.compiler.TestCompilerMojo.execute(TestCompilerMojo.java:152) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:106) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 30 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/pom.xml> to fr.ifremer.tutti/tutti-ui-swing/2.9-SNAPSHOT/tutti-ui-swing-2.9-SNAPSHOT.pom [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :tutti-persistence [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/pom.xml> to fr.ifremer.tutti/tutti-persistence/2.9-SNAPSHOT/tutti-persistence-2.9-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/pom.xml> to fr.ifremer.tutti/tutti-service/2.9-SNAPSHOT/tutti-service-2.9-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/pom.xml> to fr.ifremer/tutti/2.9-SNAPSHOT/tutti-2.9-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/target/tutti-2.9-SNAPSHOT-s…> to fr.ifremer/tutti/2.9-SNAPSHOT/tutti-2.9-SNAPSHOT-site_fr.xml Sending e-mails to: tutti-commits(a)list.forge.codelutin.com null chemit(a)codelutin.com channel stopped

1 4

Build failed in Jenkins: tutti » Tutti :: Persistence #1105
by admin+hudson＠codelutin.com 05 Nov '13

05 Nov '13

See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/1…> Changes: [Tony Chemit] fixes #3674: [CAMPAGNE] pouvoir ajouter plusieur engins professionnels de même type à une campagne ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: Persistence 2.9-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-persistence --- [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ tutti-persistence --- [INFO] [INFO] --- eugene-maven-plugin:2.7.2:generate (default) @ tutti-persistence --- [INFO] Process phase [zargo] for one entry. [INFO] Expanding 1 xmi file(s) from <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Will generate <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Copy file <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Generate one file in 26.381ms. [INFO] Process phase [xmi] for one entry. [INFO] Processing XSL tranformation on <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> for 1 file(s). [INFO] Will generate <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Copy file <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Generate one file in 1.288s. [INFO] Process phase [model] for one entry. WARN [pool-1-thread-1] (AbstractObjectModelReader.java:126) beforeReadFile - No properties provider filled, will instanciate a new default one INFO [pool-1-thread-1] (AbstractObjectModelReader.java:270) loadModelProperties - 24 tag values were succesfull imported from <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] No file generated. [INFO] Apply generator JavaInterfaceTransformer INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.TuttiEntity], already found in class-path. [INFO] Apply generator SimpleJavaBeanTransformer INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.referential.GearWithOriginalRankOrder], already found in class-path. INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.referential.GearWithOriginalRankOrderBean], already found in class-path. INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.referential.GearWithOriginalRankOrders], already found in class-path. INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocols], already found in class-path. [INFO] Apply generator JavaEnumerationTransformer INFO [pool-1-thread-1] (ObjectModelTransformerToJava.java:995) isInClassPath - Will not generate [fr.ifremer.tutti.persistence.entities.data.AttachementObjectTypeEnum], already found in class-path. [INFO] Add compile source root : <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Add resource root :Resource {targetPath: null, filtering: false, FileSet {directory: <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…,> PatternSet [includes: {}, excludes: {**/*.java}]}} [INFO] [INFO] --- i18n-maven-plugin:2.5.2:parserJava (scan-sources) @ tutti-persistence --- [INFO] [INFO] >>> i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-persistence >>> [INFO] [INFO] --- i18n-maven-plugin:2.5.2:get (get) @ tutti-persistence --- [INFO] Copying tutti-persistence.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Copying tutti-persistence.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] [INFO] <<< i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-persistence <<< [INFO] [INFO] --- i18n-maven-plugin:2.5.2:gen (scan-sources) @ tutti-persistence --- [WARNING] bundle en_GB contains 59/59 empty entries! (use -Di18n.showEmpty to see these entries) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 9 resources [INFO] Copying 0 resource [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ tutti-persistence --- [INFO] Compiling 184 source files to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [WARNING] bootstrap class path not set in conjunction with -source 1.6 [WARNING] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>: Some input files use unchecked or unsafe operations. [WARNING] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>: Recompile with -Xlint:unchecked for details. [INFO] [INFO] --- maven-antrun-plugin:1.7:run (generate-surefire-workdir) @ tutti-persistence --- [INFO] Executing tasks main: [mkdir] Created dir: <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] Executed tasks [INFO] [INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ tutti-persistence --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 5 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:testCompile (default-testCompile) @ tutti-persistence --- [INFO] Compiling 32 source files to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] 1 warning [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-persistence/w…>:[265,37] method saveCruise in interface fr.ifremer.tutti.persistence.service.CruisePersistenceService cannot be applied to given types; required: fr.ifremer.tutti.persistence.entities.data.Cruise,boolean,boolean found: fr.ifremer.tutti.persistence.entities.data.Cruise reason: actual and formal argument lists differ in length [INFO] 1 error [INFO] -------------------------------------------------------------

1 4

[ANN] - Tutti 2.8.1 released
by forge.codelutin.com Release Notification 05 Nov '13

05 Nov '13

The Tutti team is pleased to announce the tutti-2.8.1 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://forge.codelutin.com/projects/tutti Changes ------- Changes in this version include: New features: o [DONNEES INDIVIDUELLES] pouvoir copier les mensurations depuis la page ESPECES Issue: 3676. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] Import de base : Structure autorisée pour le zip contenant la base à importer Issue: 3623. Thanks to Tony Chemit. Resolved by tchemit. o [EXPORT] Normalisation des noms de colonnes Issue: 3656. Thanks to Tony Chemit. Resolved by tchemit. o [ERGO] Tri du tableau des espèces Issue: 3619. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [CAMPAGNE] pouvoir ajouter plusieur engins professionnels de même type à une campagne Issue: 3674. Thanks to Tony Chemit. Resolved by tchemit. o [DONNEES INDIVIDUELLES] pouvoir copier les mensurations depuis la page ESPECES Issue: 3675. Thanks to Tony Chemit. Resolved by tchemit. o [EXPORT GENERIQUE] Intégrer le fait d'avoir les navires associés sur chaque trait : nom de la colonne Issue: 3627. Thanks to Christian BONNET. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

r1335 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 05 Nov '13

05 Nov '13

Author: maven-release Date: 2013-11-05 14:52:00 +0100 (Tue, 05 Nov 2013) New Revision: 1335 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1335 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-11-05 13:51:52 UTC (rev 1334) +++ trunk/pom.xml 2013-11-05 13:52:00 UTC (rev 1335) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.8.1</version> + <version>2.9-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.8.1</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.8.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.8.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-11-05 13:51:52 UTC (rev 1334) +++ trunk/tutti-persistence/pom.xml 2013-11-05 13:52:00 UTC (rev 1335) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.8.1</version> + <version>2.9-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-11-05 13:51:52 UTC (rev 1334) +++ trunk/tutti-service/pom.xml 2013-11-05 13:52:00 UTC (rev 1335) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.8.1</version> + <version>2.9-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-11-05 13:51:52 UTC (rev 1334) +++ trunk/tutti-ui-swing/pom.xml 2013-11-05 13:52:00 UTC (rev 1335) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.8.1</version> + <version>2.9-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0