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

r1824 - in trunk/tutti-service/src: main/java/fr/ifremer/tutti/service/export/sumatra main/resources/i18n test/java/fr/ifremer/tutti/service/export/sumatra
by tchemit＠users.forge.codelutin.com 30 May '14

30 May '14

Author: tchemit Date: 2014-05-30 15:50:51 +0200 (Fri, 30 May 2014) New Revision: 1824 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1824 Log: fixes #5135 [EXPORT SUMATRA] date et heure d?\195?\169but fin trait ?\195?\160 ajouter Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.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/export/sumatra/CatchesSumatraExportServiceTest.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRow.java 2014-05-30 13:29:49 UTC (rev 1823) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRow.java 2014-05-30 13:50:51 UTC (rev 1824) @@ -40,6 +40,8 @@ public static final String PROPERTY_GEAR_SHOOTING_START_DATE = FishingOperation.PROPERTY_GEAR_SHOOTING_START_DATE; + public static final String PROPERTY_GEAR_SHOOTING_END_DATE = FishingOperation.PROPERTY_GEAR_SHOOTING_END_DATE; + public static final String PROPERTY_MULTIRIG_AGGREGATION = FishingOperation.PROPERTY_MULTIRIG_AGGREGATION; public static final String PROPERTY_GEAR_SHOOTING_START_LATITUDE = FishingOperation.PROPERTY_GEAR_SHOOTING_START_LATITUDE; @@ -92,6 +94,10 @@ return fishingOperation.getGearShootingStartDate(); } + public Date getGearShootingEndDate() { + return fishingOperation.getGearShootingEndDate(); + } + public String getMultirigAggregation() { return fishingOperation.getMultirigAggregation(); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java 2014-05-30 13:29:49 UTC (rev 1823) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/CatchRowModel.java 2014-05-30 13:50:51 UTC (rev 1824) @@ -53,6 +53,8 @@ newColumnForExport(t("tutti.service.exportSumatra.header.startLongitude"), CatchRow.PROPERTY_GEAR_SHOOTING_START_LONGITUDE, TuttiCsvUtil.FLOAT); newColumnForExport(t("tutti.service.exportSumatra.header.endLatitude"), CatchRow.PROPERTY_GEAR_SHOOTING_END_LATITUDE, TuttiCsvUtil.FLOAT); newColumnForExport(t("tutti.service.exportSumatra.header.endLongitude"), CatchRow.PROPERTY_GEAR_SHOOTING_END_LONGITUDE, TuttiCsvUtil.FLOAT); + newColumnForExport(t("tutti.service.exportSumatra.header.startDate"), CatchRow.PROPERTY_GEAR_SHOOTING_START_DATE, TuttiCsvUtil.DAY_TIME_SECOND); + newColumnForExport(t("tutti.service.exportSumatra.header.endDate"), CatchRow.PROPERTY_GEAR_SHOOTING_END_DATE, TuttiCsvUtil.DAY_TIME_SECOND); } @Override 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 2014-05-30 13:29:49 UTC (rev 1823) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2014-05-30 13:50:51 UTC (rev 1824) @@ -80,6 +80,7 @@ tutti.service.exportSumatra.error.station.null= tutti.service.exportSumatra.header.averageSize= tutti.service.exportSumatra.header.averageWeight= +tutti.service.exportSumatra.header.endDate= tutti.service.exportSumatra.header.endLatitude= tutti.service.exportSumatra.header.endLongitude= tutti.service.exportSumatra.header.genuisSpecies= @@ -89,6 +90,7 @@ tutti.service.exportSumatra.header.sign= tutti.service.exportSumatra.header.sortedWeight= tutti.service.exportSumatra.header.species= +tutti.service.exportSumatra.header.startDate= tutti.service.exportSumatra.header.startLatitude= tutti.service.exportSumatra.header.startLongitude= tutti.service.exportSumatra.header.station= 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 2014-05-30 13:29:49 UTC (rev 1823) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2014-05-30 13:50:51 UTC (rev 1824) @@ -77,6 +77,7 @@ tutti.service.exportSumatra.error.station.null=Le trait est nul tutti.service.exportSumatra.header.averageSize=longueurmoy tutti.service.exportSumatra.header.averageWeight=poidsmoy +tutti.service.exportSumatra.header.endDate=datefinstation tutti.service.exportSumatra.header.endLatitude=latitudefin tutti.service.exportSumatra.header.endLongitude=longitudefin tutti.service.exportSumatra.header.genuisSpecies=especescientifique @@ -85,6 +86,7 @@ tutti.service.exportSumatra.header.number=nbindividus tutti.service.exportSumatra.header.sign=signe tutti.service.exportSumatra.header.sortedWeight=tri +tutti.service.exportSumatra.header.startDate=datedebutstation tutti.service.exportSumatra.header.startLatitude=latitudedebut tutti.service.exportSumatra.header.startLongitude=longitudedebut tutti.service.exportSumatra.header.station=station Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java 2014-05-30 13:29:49 UTC (rev 1823) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/export/sumatra/CatchesSumatraExportServiceTest.java 2014-05-30 13:50:51 UTC (rev 1824) @@ -59,10 +59,10 @@ public static final String OPERATION_BAD_3_ID = "100115"; public static final String EXPORT_CONTENT = - "annee;station;poche;especescientifique;espececampagne;signe;tri;total;poidsmoy;longueurmoy;nbindividus;moule;latitudedebut;longitudedebut;latitudefin;longitudefin\n" + - "2013;A;1;Chama magna;CHAMMAG;;100.0;100.0;2.5;;40;0.4;;;;\n" + - "2013;A;1;Echinogammarus;ECHIGAM;;100.0;100.0;0.23980816;;417;4.17;;;;\n" + - "2013;A;1;Brissopsis atlantica;BRISATLAN;;100.0;100.0;1.0638298;10.571428;94;0.94;;;;"; + "annee;station;poche;especescientifique;espececampagne;signe;tri;total;poidsmoy;longueurmoy;nbindividus;moule;latitudedebut;longitudedebut;latitudefin;longitudefin;datedebutstation;datefinstation\n" + + "2013;A;1;Chama magna;CHAMMAG;;100.0;100.0;2.5;;40;0.4;;;;;27/09/2013 00:00:00;27/09/2013 00:00:00\n" + + "2013;A;1;Echinogammarus;ECHIGAM;;100.0;100.0;0.23980816;;417;4.17;;;;;27/09/2013 00:00:00;27/09/2013 00:00:00\n" + + "2013;A;1;Brissopsis atlantica;BRISATLAN;;100.0;100.0;1.0638298;10.571428;94;0.94;;;;;27/09/2013 00:00:00;27/09/2013 00:00:00"; protected CatchesSumatraExportService service;

1 0

r1823 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-persistence/src/main/resources/i18n tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 30 May '14

30 May '14

Author: tchemit Date: 2014-05-30 15:29:49 +0200 (Fri, 30 May 2014) New Revision: 1823 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1823 Log: fixes #5138 Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/SumatraExportResult.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.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/BenthosBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2014-05-30 11:13:50 UTC (rev 1822) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2014-05-30 13:29:49 UTC (rev 1823) @@ -39,6 +39,7 @@ import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequency; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchFrequencys; import fr.ifremer.tutti.persistence.entities.data.BenthosBatchs; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.service.util.BatchPersistenceHelper; @@ -52,6 +53,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Collections; import java.util.List; @@ -74,6 +77,9 @@ @Resource(name = "referentialPersistenceService") protected ReferentialPersistenceService referentialService; + @Resource(name = "fishingOperationPersistenceService") + protected FishingOperationPersistenceService fishingOperationPersistenceService; + @Resource(name = "batchPersistenceHelper") protected BatchPersistenceHelper batchHelper; @@ -95,6 +101,8 @@ boolean validateTree) { Preconditions.checkNotNull(fishingOperationId); + DateFormat df = new SimpleDateFormat("dd/MM/yyy"); + CatchBatch catchBatch = batchHelper.getRootCatchBatchByFishingOperationId(fishingOperationId, false); // -- Vrac > Benthos > Alive Itemized @@ -112,7 +120,9 @@ Preconditions.checkNotNull(referenceTaxon, "Can't have a rootBenthosBatch with a null taxon, but was for " + batch.getId()); Species species = referentialService.getSpeciesByReferenceTaxonId(referenceTaxon.getId()); if (species == null) { - throw new InvalidBatchModelException(t("tutti.persistence.batch.validation.unkonwn.taxon", source.getId(), referenceTaxon.getId())); + FishingOperation fishingOperation = fishingOperationPersistenceService.getFishingOperation(fishingOperationId); + String fishingOperationName = fishingOperation.getStationNumber() + " - " + fishingOperation.getFishingOperationNumber() + " - " + df.format(fishingOperation.getGearShootingStartDate()); + throw new InvalidBatchModelException(t("tutti.persistence.benthosBatch.validation.unkonwn.taxon", fishingOperationName, source.getId(), referenceTaxon.getId())); } BenthosBatch target = BenthosBatchs.newBenthosBatch(); target.setSpecies(species); @@ -135,7 +145,9 @@ Preconditions.checkNotNull(referenceTaxon, "Can't have a rootSpeciesBatch with a null taxon, but was for " + source.getId()); Species species = referentialService.getSpeciesByReferenceTaxonId(referenceTaxon.getId()); if (species == null) { - throw new InvalidBatchModelException(t("tutti.persistence.batch.validation.unkonwn.taxon", source.getId(), referenceTaxon.getId())); + FishingOperation fishingOperation = fishingOperationPersistenceService.getFishingOperation(fishingOperationId); + String fishingOperationName = fishingOperation.getStationNumber() + " - " + fishingOperation.getFishingOperationNumber() + " - " + df.format(fishingOperation.getGearShootingStartDate()); + throw new InvalidBatchModelException(t("tutti.persistence.benthosBatch.validation.unkonwn.taxon", fishingOperationName, source.getId(), referenceTaxon.getId())); } BenthosBatch target = BenthosBatchs.newBenthosBatch(); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2014-05-30 11:13:50 UTC (rev 1822) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2014-05-30 13:29:49 UTC (rev 1823) @@ -35,6 +35,7 @@ import fr.ifremer.adagio.core.dao.referential.taxon.ReferenceTaxon; import fr.ifremer.tutti.persistence.InvalidBatchModelException; import fr.ifremer.tutti.persistence.entities.data.BatchContainer; +import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency; @@ -52,6 +53,8 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.DateFormat; +import java.text.SimpleDateFormat; import java.util.Collections; import java.util.List; @@ -74,6 +77,9 @@ @Resource(name = "referentialPersistenceService") protected ReferentialPersistenceService referentialService; + @Resource(name = "fishingOperationPersistenceService") + protected FishingOperationPersistenceService fishingOperationPersistenceService; + @Resource(name = "batchPersistenceHelper") protected BatchPersistenceHelper batchHelper; @@ -95,6 +101,8 @@ boolean validateTree) throws InvalidBatchModelException { Preconditions.checkNotNull(fishingOperationId); + DateFormat df = new SimpleDateFormat("dd/MM/yyy"); + CatchBatch catchBatch = batchHelper.getRootCatchBatchByFishingOperationId(fishingOperationId, false); // -- Vrac > Species > Alive Itemized @@ -119,7 +127,9 @@ } Species species = referentialService.getSpeciesByReferenceTaxonId(referenceTaxon.getId()); if (species == null) { - throw new InvalidBatchModelException(t("tutti.persistence.batch.validation.unkonwn.taxon", source.getId(), referenceTaxon.getId())); + FishingOperation fishingOperation = fishingOperationPersistenceService.getFishingOperation(fishingOperationId); + String fishingOperationName = fishingOperation.getStationNumber() + " - " + fishingOperation.getFishingOperationNumber() + " - " + df .format(fishingOperation.getGearShootingStartDate()); + throw new InvalidBatchModelException(t("tutti.persistence.speciesBatch.validation.unkonwn.taxon", fishingOperationName, source.getId(), referenceTaxon.getId())); } SpeciesBatch target = SpeciesBatchs.newSpeciesBatch(); target.setSpecies(species); @@ -146,7 +156,9 @@ } Species species = referentialService.getSpeciesByReferenceTaxonId(referenceTaxon.getId()); if (species == null) { - throw new InvalidBatchModelException(t("tutti.persistence.batch.validation.unkonwn.taxon", source.getId(), referenceTaxon.getId())); + FishingOperation fishingOperation = fishingOperationPersistenceService.getFishingOperation(fishingOperationId); + String fishingOperationName = fishingOperation.getStationNumber() + " - " + fishingOperation.getFishingOperationNumber() + " - " + df.format(fishingOperation.getGearShootingStartDate()); + throw new InvalidBatchModelException(t("tutti.persistence.speciesBatch.validation.unkonwn.taxon", fishingOperationName , source.getId(), referenceTaxon.getId())); } SpeciesBatch target = SpeciesBatchs.newSpeciesBatch(); target.setSpecies(species); Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2014-05-30 11:13:50 UTC (rev 1822) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2014-05-30 13:29:49 UTC (rev 1823) @@ -137,6 +137,7 @@ tutti.persistence.batch.validation.vracSpeciesInertNotFound= tutti.persistence.batch.validation.vracSpeciesLifeNotFound= tutti.persistence.batch.validation.vracSpeciesNotFound= +tutti.persistence.benthosBatch.validation.unkonwn.taxon= tutti.persistence.config.generateEnumFile.error= tutti.persistence.config.generateFile.error= tutti.persistence.cruise.gearUsedInOperations.error= @@ -150,3 +151,4 @@ tutti.persistence.loader.error= tutti.persistence.protocol.delete.error= tutti.persistence.protocol.fromFile.error= +tutti.persistence.speciesBatch.validation.unkonwn.taxon= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2014-05-30 11:13:50 UTC (rev 1822) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2014-05-30 13:29:49 UTC (rev 1823) @@ -137,6 +137,7 @@ tutti.persistence.batch.validation.vracSpeciesInertNotFound=Lot 'Vrac > Espèces > Inerte' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.vracSpeciesLifeNotFound=Lot 'Vrac > Espèces > Vivant' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.vracSpeciesNotFound=Lot 'Vrac > Espèces' non trouvé, ou configuré avec d'autres critères de classement. +tutti.persistence.benthosBatch.validation.unkonwn.taxon=Opération %s - e lot benthos (%s) utilise une espèce de code inconnu (%s). tutti.persistence.config.generateEnumFile.error=Erreur lors de la génération du fichier d'énumération de la configuration de la base de données tutti.persistence.config.generateFile.error=Erreur lors de la génération du fichier de configuration de la base de données tutti.persistence.cruise.gearUsedInOperations.error=Vous essayez d'enlever un ou plusieurs engins qui sont utilisés sur des traits.<hr/>Veuillez changer l'engin des traits en question pour pouvoir les enlever de la campagne. @@ -150,3 +151,4 @@ tutti.persistence.loader.error=Erreur de conversion du dossier %s en URL tutti.persistence.protocol.delete.error=Erreur lors de la suppression du protocole %1s (fichier %2s) tutti.persistence.protocol.fromFile.error=Erreur lors de l'import du protocole du fichier %s +tutti.persistence.speciesBatch.validation.unkonwn.taxon=Opération %s - le lot espèce (%s) utilise une espèce de code inconnu (%s). Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/SumatraExportResult.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/SumatraExportResult.java 2014-05-30 11:13:50 UTC (rev 1822) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/export/sumatra/SumatraExportResult.java 2014-05-30 13:29:49 UTC (rev 1823) @@ -56,8 +56,8 @@ this.badSpecies = badSpecies; } - public void setBadBenthos(Set<String> badSBenthos) { - this.badBenthos = badSBenthos; + public void setBadBenthos(Set<String> badBenthos) { + this.badBenthos = badBenthos; } public boolean withBadSpecies() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditFishingOperationAction.java 2014-05-30 11:13:50 UTC (rev 1822) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/CancelEditFishingOperationAction.java 2014-05-30 13:29:49 UTC (rev 1823) @@ -99,9 +99,9 @@ // } } - @Override - public void postSuccessAction() { - super.postSuccessAction(); - getEditAction().displayValidationErrors(); - } +// @Override +// public void postSuccessAction() { +// super.postSuccessAction(); +// getEditAction().displayValidationErrors(); +// } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java 2014-05-30 11:13:50 UTC (rev 1822) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/EditFishingOperationAction.java 2014-05-30 13:29:49 UTC (rev 1823) @@ -128,7 +128,7 @@ * * @since 2.4 */ - protected List<String> errorMessages = Lists.newArrayList(); + protected final List<String> errorMessages = Lists.newArrayList(); /** * Flag to know if this action is part of another action. @@ -237,6 +237,8 @@ @Override public boolean prepareAction() { + errorMessages.clear(); + boolean canContinue = true; if (checkPreviousEdit) { FishingOperationsUI ui = getUI(); @@ -436,9 +438,9 @@ // ); getUI().repaint(); - if (!internalAction) { - displayValidationErrors(); - } +// if (!internalAction) { +// displayValidationErrors(); +// } } public void displayValidationErrors() { @@ -632,7 +634,6 @@ List<Attachment> attachments; - boolean catchNotFound; boolean catchEnabled; String operationId = bean == null ? null : bean.getId(); @@ -644,6 +645,8 @@ } progressionModel.adaptTotal(empty ? 1 : 6); + String validationErrorMessage = null; + if (empty) { // create a new CatchBatch @@ -657,7 +660,6 @@ attachments = Collections.emptyList(); catchEnabled = true; - catchNotFound = false; } else { @@ -683,7 +685,6 @@ batch.setFishingOperation(bean); Integer objectId = batch.getIdAsInt(); attachments = persistenceService.getAllAttachments(catchesUIModel.getObjectType(), objectId); - catchNotFound = false; catchEnabled = true; } catch (InvalidBatchModelException e) { @@ -695,8 +696,11 @@ batch = null; attachments = Collections.emptyList(); + validationErrorMessage = t("tutti.fishingOperations.warn.catchBatch.invalidSampleCategoryModel"); + + getModel().setValidationErrorMessage(validationErrorMessage); + catchEnabled = false; - catchNotFound = false; } } else { @@ -705,7 +709,8 @@ attachments = Collections.emptyList(); catchEnabled = false; - catchNotFound = true; + + validationErrorMessage = t("tutti.fishingOperations.warn.catchBatch.notFound"); } } @@ -713,9 +718,7 @@ catchesUIModel, catchBatchMonitor, batch, - true, - catchEnabled, - catchNotFound); + catchEnabled); // 4) Propagate new selected fishingoperation to others tabs @@ -751,6 +754,18 @@ catchValid = false; } + if (!errorMessages.isEmpty()) { + + StringBuilder message = new StringBuilder(); + for (String errorMessage : errorMessages) { + message.append("<li>").append(errorMessage).append("</li>"); + } + validationErrorMessage = t("tutti.fishingOperations.warn.invalid.batch", message.toString()); + + } + + getModel().setValidationErrorMessage(validationErrorMessage); + if (catchValid) { // load other tabs @@ -771,8 +786,6 @@ catchesUIModel, catchBatchMonitor, null, - false, - false, false); } @@ -789,13 +802,11 @@ EditCatchesUIModel catchesUIModel, TuttiBeanMonitor<EditCatchesUIModel> catchBatchMonitor, CatchBatch batch, - boolean sampleModelValid, - boolean catchEnabled, - boolean catchNotFound) { + boolean catchEnabled) { getModel().setCatchEnabled(catchEnabled); - getModel().setCatchNotFound(catchNotFound); - getModel().setSampleCatchModelValid(sampleModelValid); +// getModel().setCatchNotFound(catchNotFound); +// getModel().setSampleCatchModelValid(sampleModelValid); catchesUIModel.fromEntity(batch); catchesUIModel.addAllAttachment(attachments); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2014-05-30 11:13:50 UTC (rev 1822) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2014-05-30 13:29:49 UTC (rev 1823) @@ -62,7 +62,8 @@ #warningLabel { actionIcon: warning; border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)}; - text: {handler.getCatchWarningLabel(model.isCatchEnabled(), model.isCatchNotFound(), model.isSampleCatchModelValid())}; + /*text: {handler.getCatchWarningLabel(model.isCatchEnabled(), model.isCatchNotFound(), model.isSampleCatchModelValid())};*/ + text: {model.getValidationErrorMessage()}; } #catchesTab { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2014-05-30 11:13:50 UTC (rev 1822) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIHandler.java 2014-05-30 13:29:49 UTC (rev 1823) @@ -23,7 +23,6 @@ */ import com.google.common.collect.Lists; -import org.nuiton.jaxx.application.swing.util.CloseableUI; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Cruise; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; @@ -37,6 +36,7 @@ import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.application.swing.util.CloseableUI; import javax.swing.JComponent; import javax.swing.JTabbedPane; @@ -276,20 +276,6 @@ //-- Public methods --// //------------------------------------------------------------------------// - public String getCatchWarningLabel(boolean catchEnabled, - boolean catchNotFound, - boolean catchSampleModelValid) { - String result = null; - if (!catchSampleModelValid) { - result = t("tutti.fishingOperations.warn.catchBatch.invalidSampleCategoryModel"); - } else if (catchNotFound) { - result = t("tutti.fishingOperations.warn.catchBatch.notFound"); - } else if (!catchEnabled) { - result = t("tutti.fishingOperations.warn.invalid.batch.model"); - } - return result; - } - public boolean isFishingOperationModified() { return getModel().getEditFishingOperation() != null && getUI().getFishingOperationTabContent().getModel().isModify(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2014-05-30 11:13:50 UTC (rev 1822) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUIModel.java 2014-05-30 13:29:49 UTC (rev 1823) @@ -58,6 +58,8 @@ public static final String PROPERTY_SAMPLE_CATCH_MODEL_VALID = "sampleCatchModelValid"; + public static final String PROPERTY_VALIDATION_ERROR_MESSAGE = "validationErrorMessage"; + /** * List of existing fishing operation for the selected cruise. * @@ -118,23 +120,12 @@ protected boolean catchEnabled = true; /** - * Flag to know if sample catch model is valid or not on the selected - * fishing operation. - * - * Note: When value is {@code false}, then - * {@link #catchEnabled} is always to {@code false} too. + * contains if any error message while loading the fishing operation catch batch. * - * @since 2.4 + * @since 3.5 */ - protected boolean sampleCatchModelValid = true; + protected String validationErrorMessage; - /** - * Flag setted to true when no catch found. - * - * @since 2.2 - */ - protected boolean catchNotFound; - public List<FishingOperation> getFishingOperation() { return fishingOperation; } @@ -236,23 +227,13 @@ firePropertyChange(PROPERTY_CATCH_ENABLED, oldValue, catchEnabled); } - public boolean isCatchNotFound() { - return catchNotFound; + public String getValidationErrorMessage() { + return validationErrorMessage; } - public void setCatchNotFound(boolean catchNotFound) { - boolean oldValue = isCatchNotFound(); - this.catchNotFound = catchNotFound; - firePropertyChange(PROPERTY_CATCH_NOT_FOUND, oldValue, catchNotFound); + public void setValidationErrorMessage(String validationErrorMessage) { + String oldValue = getValidationErrorMessage(); + this.validationErrorMessage = validationErrorMessage; + firePropertyChange(PROPERTY_VALIDATION_ERROR_MESSAGE, oldValue, validationErrorMessage); } - - public boolean isSampleCatchModelValid() { - return sampleCatchModelValid; - } - - public void setSampleCatchModelValid(boolean sampleCatchModelValid) { - boolean oldValue = isSampleCatchModelValid(); - this.sampleCatchModelValid = sampleCatchModelValid; - firePropertyChange(PROPERTY_SAMPLE_CATCH_MODEL_VALID, oldValue, sampleCatchModelValid); - } } 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 2014-05-30 11:13:50 UTC (rev 1822) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-05-30 13:29:49 UTC (rev 1823) @@ -1183,6 +1183,7 @@ tutti.fishingOperations.title.validate.operations= tutti.fishingOperations.warn.catchBatch.invalidSampleCategoryModel= tutti.fishingOperations.warn.catchBatch.notFound= +tutti.fishingOperations.warn.invalid.batch= tutti.fishingOperations.warn.invalid.batch.model= tutti.flash.info.all.caractristic.exported= tutti.flash.info.benthos.add.to.protocol= 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 2014-05-30 11:13:50 UTC (rev 1822) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-05-30 13:29:49 UTC (rev 1823) @@ -1116,7 +1116,7 @@ tutti.exportCruise.action.success=La campagne %s a été exportée dans le fichier %s. tutti.exportCruiseForSumatra.action.chooseFile=Choisir le fichier d'export tutti.exportCruiseForSumatra.action.success=La campagne sélectionnée a été exportée dans le fichier %s -tutti.exportCruiseForSumatra.message.missing.protocol=<html><body>Pas de protocole renseigné, La colonne espcecamapgne ne sera pas renseigné.</body></html> +tutti.exportCruiseForSumatra.message.missing.protocol=<html><body>Pas de protocole renseigné, La colonne espececampagne ne sera pas renseigné.</body></html> tutti.exportCruiseForSumatra.title.choose.exportFile=Exporter la campagne tutti.exportCruiseForSumatra.title.missing.protocol=Pas de protocole renseigné tutti.exportCruiseForSumatraV2.message.required.protocol= @@ -1155,6 +1155,7 @@ tutti.fishingOperations.title.validate.operations=Validation des opérations de pêches (%s) tutti.fishingOperations.warn.catchBatch.invalidSampleCategoryModel=L'arbre d’échantillonnage n'est pas compatible (utilisation de catégories non configurées ou dans un mauvais ordre). Les captures ne seront pas visibles. tutti.fishingOperations.warn.catchBatch.notFound=Pas d'arbre d’échantillonnage associé à l'opération de pêche. +tutti.fishingOperations.warn.invalid.batch=<html><body>Les erreurs suivantes ont été détectées, impossible d'afficher les captures \: <ul>%s</ul></body></html>. tutti.fishingOperations.warn.invalid.batch.model=L'arbre d’échantillonnage n'est pas compatible. Les captures ne seront pas visibles. tutti.flash.info.all.caractristic.exported=Toutes les caractéristiques exportées dans le fichier %s. tutti.flash.info.benthos.add.to.protocol=Le benthos %s a été ajoutée au protocole.

1 0

r1822 - in trunk: . tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content
by tchemit＠users.forge.codelutin.com 30 May '14

30 May '14

Author: tchemit Date: 2014-05-30 13:13:50 +0200 (Fri, 30 May 2014) New Revision: 1822 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1822 Log: fixes #5153: [TECH] Fichier d'ui corrompu Modified: trunk/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-30 08:03:46 UTC (rev 1821) +++ trunk/pom.xml 2014-05-30 11:13:50 UTC (rev 1822) @@ -143,7 +143,7 @@ <nuitonI18nVersion>3.0</nuitonI18nVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> <eugenePluginVersion>2.10-SNAPSHOT</eugenePluginVersion> - <jaxxVersion>2.8.5</jaxxVersion> + <jaxxVersion>2.8.6-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.5</slf4jVersion> <adagioVersion>3.5.5</adagioVersion> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-05-30 08:03:46 UTC (rev 1821) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2014-05-30 11:13:50 UTC (rev 1822) @@ -324,7 +324,7 @@ Map<Class, State> additionalStates = Maps.newHashMap(); additionalStates.put(BeanFilterableComboBox.class, new BeanFilterableComboBoxState()); additionalStates.put(BeanDoubleList.class, new BeanDoubleListState()); - this.swingSession = new SwingSession(getConfig().getUIConfigFile(), false, additionalStates); + this.swingSession = SwingSession.newSession(getConfig().getUIConfigFile(), false, additionalStates); //FIXME Push this to ifremer-shared this.errorHelper = new ApplicationErrorHelper(this) { @@ -454,7 +454,7 @@ i18nLocale, i18nDirectory)); } I18n.init(new UserI18nInitializer( - i18nDirectory, new DefaultI18nInitializer("tutti-i18n")), + i18nDirectory, new DefaultI18nInitializer("tutti-i18n")), i18nLocale); @@ -865,6 +865,16 @@ return swingSession; } + public void saveSwingSession() { + + try { + getSwingSession().save(); + } catch (IOException e) { + throw new ApplicationTechnicalException("Could not save ui config file: " + swingSession.getFile(), e); + } + + } + public TuttiScreen getScreen() { return screen; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2014-05-30 08:03:46 UTC (rev 1821) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUIHandler.java 2014-05-30 11:13:50 UTC (rev 1822) @@ -196,7 +196,7 @@ // Init SwingSession SwingSession swingSession = getContext().getSwingSession(); swingSession.add(ui); - swingSession.save(); + getContext().saveSwingSession(); //SwingUtil.getLayer(ui.getBody()).setUI(new BetaLayerUI()); @@ -358,7 +358,7 @@ TuttiUI<?, ?> body = (TuttiUI<?, ?>) currentBody; body.getHandler().onCloseUI(); - context.getSwingSession().save(); + context.saveSwingSession(); ui.getBody().remove(currentBody);

1 0

Build failed in Jenkins: tutti-ci #93
by admin+ci-codelutin.com＠codelutin.com 30 May '14

30 May '14

See <http://ci.codelutin.com/jenkins/job/tutti-ci/93/changes> Changes: [Tony CHEMIT] refs #4959 implements it ------------------------------------------ Started by an SCM change Building in workspace <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/> Reverting <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk> to depth infinity with ignoreExternals: false Updating https://svn.codelutin.com/tutti/trunk at revision '2014-05-28T17:48:18.032 +0200' U tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java U tutti-ui-swing/src/license/THIRD-PARTY.properties U tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ComputeBatchWeightsAction.java U tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/SaveCruiseToReadyToSynchAction.java U tutti-ui-swing/src/main/filtered-resources/log4j.properties U pom.xml U tutti-persistence/src/main/resources/queries-failsafe.hbm.xml U tutti-persistence/src/main/xmi/tutti-persistence.zargo U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/MeasurementPersistenceHelper.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchTreeHelper.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/util/BatchPersistenceHelper.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/MarineLitterBatchPersistenceServiceImpl.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceService.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java U tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java At revision 1818 Parsing POMs Modules changed, recalculating dependency graph [trunk] $ /opt/jdk7/bin/java -Dsettings.security=/var/local/forge/data/codelutin.com/maven/settings-security.xml -Djava.awt.headless=true -cp /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-agent-1.5.jar:/opt/maven3/boot/plexus-classworlds-2.5.1.jar:/opt/maven3/conf/logging jenkins.maven3.agent.Maven31Main /opt/maven3 /var/local/forge/exec/tomcat-codelutin.com/webapps/jenkins/WEB-INF/lib/remoting-2.39.jar /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven31-interceptor-1.5.jar /var/local/forge/data/codelutin.com/jenkins/plugins/maven-plugin/WEB-INF/lib/maven3-interceptor-commons-1.5.jar 34194 <===[JENKINS REMOTING CAPACITY]===> channel started Executing Maven: -B -f <http://ci.codelutin.com/jenkins/job/tutti-ci/ws/trunk/pom.xml> -s /var/local/forge/data/codelutin.com/maven/settings.xml -e -U clean verify [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [INFO] ------------------------------------------------------------------------ [INFO] Reactor Build Order: [INFO] [INFO] Tutti [INFO] Tutti :: Persistence [INFO] Tutti :: Ichtyometer API [INFO] Tutti :: Service [INFO] Tutti :: UI [INFO] [INFO] Using the builder org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder with a thread count of 1 [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti 3.5-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti --- [INFO] Deleting <http://ci.codelutin.com/jenkins/job/tutti-ci/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.codelutin.com/jenkins/job/tutti-ci/ws/trunk/target/surefire-workd…> [INFO] Executed tasks [INFO] [INFO] --- maven-site-plugin:3.3:attach-descriptor (attach-descriptor) @ tutti --- [JENKINS] Archiving disabled [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: Persistence 3.5-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/eugene… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (2 KB at 11.1 KB/sec) [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/eugene… (2 KB at 4.2 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/eugene… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/snapshots/org/nuiton/eug… (1017 B at 24.8 KB/sec) [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/eugene… (1017 B at 15.0 KB/sec) [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/fr/ifremer/ada… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/fr/ifremer/ada… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio… [WARNING] The POM for fr.ifremer.adagio:adagio-core-shared:jar:3.5.5-SNAPSHOT is missing, no dependency information available [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/fr/ifremer/ada… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/fr/ifremer/ada… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio… [WARNING] The POM for fr.ifremer.adagio:adagio-core-allegro:jar:3.5.5-SNAPSHOT is missing, no dependency information available [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/eso… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/tutti-group/com/esotericsoftw… [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/tutti-group/com/esotericsoftw… (5 KB at 47.6 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/com/esotericsoftware/yamlbeans/yamlbean… [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/esotericsoftware/yamlbeans/yamlbean… (5 KB at 5.0 KB/sec) [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/fr/ifremer/ada… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/snapshots/fr/ifremer/ada… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/tutti-group/fr/ifremer/adagio… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/com/eso… [INFO] Downloading: https://nexus.nuiton.org/nexus/content/groups/tutti-group/com/esotericsoftw… [INFO] Downloaded: https://nexus.nuiton.org/nexus/content/groups/tutti-group/com/esotericsoftw… (142 KB at 968.8 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/com/esotericsoftware/yamlbeans/yamlbean… [INFO] Downloaded: http://repo.maven.apache.org/maven2/com/esotericsoftware/yamlbeans/yamlbean… (142 KB at 1664.0 KB/sec) [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [JENKINS] Archiving disabled [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [ 1.856 s] [INFO] Tutti :: Persistence .............................. FAILURE [ 2.135 s] [INFO] Tutti :: Ichtyometer API .......................... SKIPPED [INFO] Tutti :: Service .................................. SKIPPED [INFO] Tutti :: UI ....................................... SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 5.255 s [INFO] Finished at: 2014-05-28T17:48:29+01:00 [INFO] Final Memory: 21M/311M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal on project tutti-persistence: Could not resolve dependencies for project fr.ifremer.tutti:tutti-persistence:jar:3.5-SNAPSHOT: The following artifacts could not be resolved: fr.ifremer.adagio:adagio-core-shared:jar:3.5.5-SNAPSHOT, fr.ifremer.adagio:adagio-core-allegro:jar:3.5.5-SNAPSHOT: Could not find artifact fr.ifremer.adagio:adagio-core-shared:jar:3.5.5-SNAPSHOT in snapshots (http://nexus.nuiton.org/nexus/content/repositories/snapshots) -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal on project tutti-persistence: Could not resolve dependencies for project fr.ifremer.tutti:tutti-persistence:jar:3.5-SNAPSHOT: The following artifacts could not be resolved: fr.ifremer.adagio:adagio-core-shared:jar:3.5.5-SNAPSHOT, fr.ifremer.adagio:adagio-core-allegro:jar:3.5.5-SNAPSHOT: Could not find artifact fr.ifremer.adagio:adagio-core-shared:jar:3.5.5-SNAPSHOT in snapshots (http://nexus.nuiton.org/nexus/content/repositories/snapshots) at org.apache.maven.lifecycle.internal.LifecycleDependencyResolver.getDependencies(LifecycleDependencyResolver.java:220) at org.apache.maven.lifecycle.internal.LifecycleDependencyResolver.resolveProjectDependencies(LifecycleDependencyResolver.java:127) at org.apache.maven.lifecycle.internal.MojoExecutor.ensureDependenciesAreResolved(MojoExecutor.java:257) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:200) 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:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) 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:328) 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:745) Caused by: org.apache.maven.project.DependencyResolutionException: Could not resolve dependencies for project fr.ifremer.tutti:tutti-persistence:jar:3.5-SNAPSHOT: The following artifacts could not be resolved: fr.ifremer.adagio:adagio-core-shared:jar:3.5.5-SNAPSHOT, fr.ifremer.adagio:adagio-core-allegro:jar:3.5.5-SNAPSHOT: Could not find artifact fr.ifremer.adagio:adagio-core-shared:jar:3.5.5-SNAPSHOT in snapshots (http://nexus.nuiton.org/nexus/content/repositories/snapshots) at org.apache.maven.project.DefaultProjectDependenciesResolver.resolve(DefaultProjectDependenciesResolver.java:198) at org.apache.maven.lifecycle.internal.LifecycleDependencyResolver.getDependencies(LifecycleDependencyResolver.java:195) ... 33 more Caused by: org.eclipse.aether.resolution.DependencyResolutionException: The following artifacts could not be resolved: fr.ifremer.adagio:adagio-core-shared:jar:3.5.5-SNAPSHOT, fr.ifremer.adagio:adagio-core-allegro:jar:3.5.5-SNAPSHOT: Could not find artifact fr.ifremer.adagio:adagio-core-shared:jar:3.5.5-SNAPSHOT in snapshots (http://nexus.nuiton.org/nexus/content/repositories/snapshots) at org.eclipse.aether.internal.impl.DefaultRepositorySystem.resolveDependencies(DefaultRepositorySystem.java:384) at org.apache.maven.project.DefaultProjectDependenciesResolver.resolve(DefaultProjectDependenciesResolver.java:192) ... 34 more Caused by: org.eclipse.aether.resolution.ArtifactResolutionException: The following artifacts could not be resolved: fr.ifremer.adagio:adagio-core-shared:jar:3.5.5-SNAPSHOT, fr.ifremer.adagio:adagio-core-allegro:jar:3.5.5-SNAPSHOT: Could not find artifact fr.ifremer.adagio:adagio-core-shared:jar:3.5.5-SNAPSHOT in snapshots (http://nexus.nuiton.org/nexus/content/repositories/snapshots) at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolve(DefaultArtifactResolver.java:459) at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolveArtifacts(DefaultArtifactResolver.java:262) at org.eclipse.aether.internal.impl.DefaultRepositorySystem.resolveDependencies(DefaultRepositorySystem.java:367) ... 35 more Caused by: org.eclipse.aether.transfer.ArtifactNotFoundException: Could not find artifact fr.ifremer.adagio:adagio-core-shared:jar:3.5.5-SNAPSHOT in snapshots (http://nexus.nuiton.org/nexus/content/repositories/snapshots) at org.eclipse.aether.connector.wagon.WagonRepositoryConnector$6.wrap(WagonRepositoryConnector.java:1012) at org.eclipse.aether.connector.wagon.WagonRepositoryConnector$6.wrap(WagonRepositoryConnector.java:1004) at org.eclipse.aether.connector.wagon.WagonRepositoryConnector$GetTask.run(WagonRepositoryConnector.java:725) at org.eclipse.aether.util.concurrency.RunnableErrorForwarder$1.run(RunnableErrorForwarder.java:67) ... 3 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/DependencyResolutionExcept… [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :tutti-persistence Sending e-mails to: tutti-commits(a)list.forge.codelutin.com chemit+codelutin-ci(a)codelutin.com channel stopped

1 3

Build failed in Jenkins: tutti-ci » Tutti :: UI #94
by admin+ci-codelutin.com＠codelutin.com 30 May '14

30 May '14

1 2

r1821 - in trunk: tutti-persistence/src/license tutti-service/src/license
by tchemit＠users.forge.codelutin.com 30 May '14

30 May '14

Author: tchemit Date: 2014-05-30 10:03:46 +0200 (Fri, 30 May 2014) New Revision: 1821 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1821 Log: update third parties files Modified: trunk/tutti-persistence/src/license/THIRD-PARTY.properties trunk/tutti-service/src/license/THIRD-PARTY.properties Modified: trunk/tutti-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-persistence/src/license/THIRD-PARTY.properties 2014-05-30 07:51:16 UTC (rev 1820) +++ trunk/tutti-persistence/src/license/THIRD-PARTY.properties 2014-05-30 08:03:46 UTC (rev 1821) @@ -1,11 +1,18 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 # - Affero General Public License (AGPL) +# - Apache License 2.0 +# - Apache License Version 2.0 +# - Apache License, version 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Common Public License Version 1.0 -# - General Public License (GPL) +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - GNU General Public License, Version 2 with the Classpath Exception # - HSQLDB License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) @@ -17,13 +24,11 @@ # - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 -# - license.txt +# - WTFPL #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Dec 03 15:42:52 CET 2013 -antlr--antlr--2.7.6=BSD License +#Fri May 30 09:52:42 CEST 2014 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Modified: trunk/tutti-service/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-service/src/license/THIRD-PARTY.properties 2014-05-30 07:51:16 UTC (rev 1820) +++ trunk/tutti-service/src/license/THIRD-PARTY.properties 2014-05-30 08:03:46 UTC (rev 1821) @@ -1,13 +1,21 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 # - Affero General Public License (AGPL) +# - Apache License 2.0 +# - Apache License Version 2.0 +# - Apache License, version 2.0 # - BSD License # - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License # - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - v 1.0 # - GNU Affero General Public License v3 +# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License (LGPL), version 2.1 # - GNU Library or Lesser General Public License # - General Public License (GPL) @@ -26,13 +34,12 @@ # - Public Domain # - The Apache Software License, Version 2.0 # - The MIT License -# - license.txt +# - WTFPL #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jan 31 11:50:47 CET 2014 -antlr--antlr--2.7.6=BSD License +#Fri May 30 09:52:42 CEST 2014 batik--batik-awt-util--1.6=The Apache Software License, Version 2.0 batik--batik-bridge--1.6=The Apache Software License, Version 2.0 batik--batik-css--1.6=The Apache Software License, Version 2.0 @@ -48,4 +55,3 @@ batik--batik-xml--1.6=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0

1 0

Build failed in Jenkins: tutti-nightly » Tutti :: Persistence #44
by admin+ci-codelutin.com＠codelutin.com 30 May '14

30 May '14

1 3

r1820 - in trunk: . tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-ui-swing/src/license
by tchemit＠users.forge.codelutin.com 30 May '14

30 May '14

Author: tchemit Date: 2014-05-30 09:51:16 +0200 (Fri, 30 May 2014) New Revision: 1820 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1820 Log: fix adagio dependencies and spring conf Modified: trunk/pom.xml trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-29 05:13:18 UTC (rev 1819) +++ trunk/pom.xml 2014-05-30 07:51:16 UTC (rev 1820) @@ -142,7 +142,7 @@  <nuitonI18nVersion>3.0</nuitonI18nVersion> <nuitonValidatorVersion>3.0-rc-1</nuitonValidatorVersion> - <eugenePluginVersion>2.9-SNAPSHOT</eugenePluginVersion> + <eugenePluginVersion>2.10-SNAPSHOT</eugenePluginVersion> <jaxxVersion>2.8.5</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.5</slf4jVersion> @@ -214,6 +214,16 @@ <groupId>fr.ifremer.adagio</groupId> <artifactId>adagio-core-allegro</artifactId> <version>${adagioVersion}</version> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-spatial</artifactId> + </exclusion> + <exclusion> + <groupId>com.vividsolutions</groupId> + <artifactId>jts</artifactId> + </exclusion> + </exclusions> </dependency>  Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java 2014-05-29 05:13:18 UTC (rev 1819) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/TuttiPersistenceServiceLocator.java 2014-05-30 07:51:16 UTC (rev 1820) @@ -117,7 +117,7 @@ //TODO Move this to adagio public static ReferentialSynchroService getReferentialSynchroService() { ReferentialSynchroService service = instance().getService( - "referentialSynchroService", ReferentialSynchroService.class); + "deprecatedReferentialSynchroService", ReferentialSynchroService.class); return service; } Modified: trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties =================================================================== --- trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2014-05-29 05:13:18 UTC (rev 1819) +++ trunk/tutti-ui-swing/src/license/THIRD-PARTY.properties 2014-05-30 07:51:16 UTC (rev 1820) @@ -39,7 +39,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue May 27 17:05:30 CEST 2014 +#Fri May 30 09:08:49 CEST 2014 batik--batik-awt-util--1.6=The Apache Software License, Version 2.0 batik--batik-bridge--1.6=The Apache Software License, Version 2.0 batik--batik-css--1.6=The Apache Software License, Version 2.0 @@ -55,4 +55,3 @@ batik--batik-xml--1.6=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -org.hibernate--hibernate-spatial--4.3-20140213=Lesser General Public License (LGPL)

1 0

Build failed in Jenkins: tutti-ci » Tutti :: Persistence #93
by admin+ci-codelutin.com＠codelutin.com 29 May '14

29 May '14

1 1

r1819 - trunk
by tchemit＠users.forge.codelutin.com 29 May '14

29 May '14

Author: tchemit Date: 2014-05-29 07:13:18 +0200 (Thu, 29 May 2014) New Revision: 1819 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1819 Log: use last adagio stable version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-05-28 15:35:16 UTC (rev 1818) +++ trunk/pom.xml 2014-05-29 05:13:18 UTC (rev 1819) @@ -146,7 +146,7 @@ <jaxxVersion>2.8.5</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.5</slf4jVersion> - <adagioVersion>3.5.5-SNAPSHOT</adagioVersion> + <adagioVersion>3.5.5</adagioVersion> <bluecoveVersion>2.1.0</bluecoveVersion> <hibernateVersion>4.3.1.Final</hibernateVersion> <springVersion>4.0.1.RELEASE</springVersion>

1 0