April 2012 - Echobase-commits - mailman.cloud.codelutin.com

r495 - in trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata: . csv
by tchemit＠users.forge.codelutin.com 06 Apr '12

06 Apr '12

Author: tchemit Date: 2012-04-06 16:00:39 +0200 (Fri, 06 Apr 2012) New Revision: 495 Url: http://forge.codelutin.com/repositories/revision/echobase/495 Log: fixes #1093: Ajout du champs Strata sur l'entit?\195?\169 LengthWeightKey Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportRow.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2012-04-06 13:05:36 UTC (rev 494) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2012-04-06 14:00:39 UTC (rev 495) @@ -89,6 +89,9 @@ Species.class, EchoBaseFunctions.SPECIES_BARACOUDA_CODE); + Map<String, Strata> strataMap = getEntitiesMap( + Strata.class, EchoBaseFunctions.STRATA_BY_NAME); + // get selected voyage Voyage voyage = getEntityById(Voyage.class, configuration.getVoyageId()); @@ -108,6 +111,7 @@ configuration, inputFile, voyageMap, + strataMap, speciesMap ); configuration.addResult(importResult); @@ -120,6 +124,7 @@ configuration, inputFile, voyageMap, + strataMap, speciesMap ); configuration.addResult(importResult); @@ -142,6 +147,7 @@ ResultsImportConfiguration configuration, InputFile inputFile, Map<String, Voyage> voyageMap, + Map<String, Strata> strataMap, Map<String, Species> speciesMap) throws ImportException { if (log.isInfoEnabled()) { @@ -159,6 +165,7 @@ LengthWeightKeyImportModel csvModel = new LengthWeightKeyImportModel( serviceContext.getConfiguration().getCsvSeparator(), voyageMap, + strataMap, sizeCategoryMap, speciesMap); @@ -216,6 +223,7 @@ ResultsImportConfiguration configuration, InputFile inputFile, Map<String, Voyage> voyageMap, + Map<String, Strata> strataMap, Map<String, Species> speciesMap) throws ImportException { if (log.isInfoEnabled()) { @@ -226,9 +234,6 @@ CsvFileImportResult importResult = new CsvFileImportResult( inputFile.getFileName()); - Map<String, Strata> strataMap = getEntitiesMap( - Strata.class, EchoBaseFunctions.STRATA_BY_NAME); - LengthAgeKeyImportModel csvModel = new LengthAgeKeyImportModel( serviceContext.getConfiguration().getCsvSeparator(), voyageMap, Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java 2012-04-06 13:05:36 UTC (rev 494) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java 2012-04-06 14:00:39 UTC (rev 495) @@ -29,6 +29,7 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.Strata; import java.util.Map; @@ -42,6 +43,7 @@ public LengthWeightKeyImportModel(char separator, Map<String, Voyage> voyageMap, + Map<String, Strata> strataMap, Map<String, SizeCategory> sizeCategoryMap, Map<String, Species> speciesMap) { super(separator); @@ -51,6 +53,7 @@ newForeignKeyColumn(LengthWeightKeyImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); newForeignKeyColumn(LengthWeightKeyImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, LengthWeightKeyImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(LengthWeightKey.PROPERTY_STRATA, Strata.class, Strata.PROPERTY_NAME, strataMap); } @Override Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportRow.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportRow.java 2012-04-06 13:05:36 UTC (rev 494) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportRow.java 2012-04-06 14:00:39 UTC (rev 495) @@ -28,6 +28,7 @@ import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.SizeCategory; import fr.ifremer.echobase.entities.references.Species; +import fr.ifremer.echobase.entities.references.Strata; import java.io.Serializable; @@ -94,4 +95,8 @@ public void setAParameter(float AParameter) { lengthWeightKey.setAParameter(AParameter); } + + public void setStrata(Strata strata) { + lengthWeightKey.setStrata(strata); + } } \ No newline at end of file

1 0

r494 - trunk/src/doc/reunions
by tchemit＠users.forge.codelutin.com 06 Apr '12

06 Apr '12

Author: tchemit Date: 2012-04-06 15:05:36 +0200 (Fri, 06 Apr 2012) New Revision: 494 Url: http://forge.codelutin.com/repositories/revision/echobase/494 Log: refs #483, r?\195?\169union Added: trunk/src/doc/reunions/reunion-2012-04-06.txt Added: trunk/src/doc/reunions/reunion-2012-04-06.txt =================================================================== --- trunk/src/doc/reunions/reunion-2012-04-06.txt (rev 0) +++ trunk/src/doc/reunions/reunion-2012-04-06.txt 2012-04-06 13:05:36 UTC (rev 494) @@ -0,0 +1,45 @@ +projet echobase +--------------- + +Vendredi 6 avril 2012 (Ifremer) + +Présents : Mathieu et Tony + +Retours +------- + +- uniformiser format date - heure en utilisant uniquement le format yyyy-MM-dd HH:mm:ss.SSSS (#1091) +- mettre en place la doc en ligne pour que Mathieu puisse faire la documentation des imports. (#1092) +- mettre en place le lien sur les imports qui bascule sur la documentation (#1092) +- mettre un label sur import resultat voyage (pour indiquer qu'il faut au moins) (#1087) + un fichier resultat - voyage / resultat esdu - pêche) +- rendre optionnel sur import pêche les fichiers (il en faut au moins un) (#1087) +- import sub-sample utiliser les colonnes units et round pour afiner le SampleDataType voir procédure (#1087) +- LenghtWeightKey ajouter strata comme pour lengthAgeKey et pour l'import faire de même (pense aussi à impacter les données legacy) (#1093) +- changer l'ordre des imports résultats (done) +- mettre le style en dynamique (width:100% et plus en auto) +- améliorer l'écran des infos de connexion (ajouter le driver à utiliser) (#484) +- passer sur la base embarquée en mode serveur (sinon il faut arrêter le + serveur pour aller dans libre-office :(). (#1094) +- vérifier que les echotypes sont uniques au sein d'un même voyage (revoir sql import historique) (#1087) +- ajouter la colonne voyage sur tous les imports de resultats esdu (#1087) +- ajouter une configuration pour changer l'image de fond de l'application (Bonus) +- petite doc pour sauver - reimporter une base complète. (#484) + +Action +------ + +- Tony : +- Faire une release 0.6 pour traiter tous les points restant +- mettre en place un module svn pour mettre les scripts R (#1062) +- phase de test (#499) + +- Mathieu : +- phase de test (#499) +- fournir les scripts de création des fichiers (#1062) +- préparer le requétage à faire +- fichiers de traduction (#1016) + +Prochaine réunion : + + - Vendredi 13 Avril à 10h00 \ No newline at end of file Property changes on: trunk/src/doc/reunions/reunion-2012-04-06.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r493 - trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData
by tchemit＠users.forge.codelutin.com 05 Apr '12

05 Apr '12

Author: tchemit Date: 2012-04-05 18:08:21 +0200 (Thu, 05 Apr 2012) New Revision: 493 Url: http://forge.codelutin.com/repositories/revision/echobase/493 Log: refs #1087: Validation des imports (missing some result by esdu file mapping) Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java 2012-04-05 14:56:16 UTC (rev 492) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureResultsImport.java 2012-04-05 16:08:21 UTC (rev 493) @@ -219,11 +219,11 @@ getModel().getEsduByEchotypeFile().setContentType(contentType); } - public void setEsduByEchotypeFileName(String fileName) { + public void setEsduByEchotypeFileFileName(String fileName) { getModel().getEsduByEchotypeFile().setFileName(fileName); } - public void setEsduByEchotypeAndSpeciesCategoryFileFile(File file) { + public void setEsduByEchotypeAndSpeciesCategoryFile(File file) { getModel().getEsduByEchotypeAndSpeciesCategoryFile().setFile(file); } @@ -231,7 +231,7 @@ getModel().getEsduByEchotypeAndSpeciesCategoryFile().setContentType(contentType); } - public void setEsduByEchotypeAndSpeciesCategoryFileName(String fileName) { + public void setEsduByEchotypeAndSpeciesCategoryFileFileName(String fileName) { getModel().getEsduByEchotypeAndSpeciesCategoryFile().setFileName(fileName); } @@ -243,7 +243,7 @@ getModel().getEsduBySpeciesAndSizeCategoryFile().setContentType(contentType); } - public void setEsduBySpeciesAndSizeCategoryFileName(String fileName) { + public void setEsduBySpeciesAndSizeCategoryFileFileName(String fileName) { getModel().getEsduBySpeciesAndSizeCategoryFile().setFileName(fileName); } @@ -255,7 +255,7 @@ getModel().getEsduBySpeciesAndAgeCategoryFile().setContentType(contentType); } - public void setEsduBySpeciesAndAgeCategoryFileName(String fileName) { + public void setEsduBySpeciesAndAgeCategoryFileFileName(String fileName) { getModel().getEsduBySpeciesAndAgeCategoryFile().setFileName(fileName); } }

1 0

r492 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata
by tchemit＠users.forge.codelutin.com 05 Apr '12

05 Apr '12

Author: tchemit Date: 2012-04-05 16:56:16 +0200 (Thu, 05 Apr 2012) New Revision: 492 Url: http://forge.codelutin.com/repositories/revision/echobase/492 Log: refs #1087: Validation des imports Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java 2012-04-05 07:25:09 UTC (rev 491) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java 2012-04-05 14:56:16 UTC (rev 492) @@ -210,6 +210,7 @@ } Date startDate = row.getCellDateStart(); + Date endDate = row.getCellDateEnd(); // get transect to use Transit transit = voyage.getTransit(startDate); @@ -336,7 +337,7 @@ int cellType = row.getCellType(); - String esduCellId = cellDateFormat.format(startDate); + String esduCellId = cellDateFormat.format(endDate); DataQuality dataQuality = row.getDataQuality();

1 0

r491 - trunk/echobase-services/src/test/resources/import-data/catches
by tchemit＠users.forge.codelutin.com 05 Apr '12

05 Apr '12

Author: tchemit Date: 2012-04-05 09:25:09 +0200 (Thu, 05 Apr 2012) New Revision: 491 Url: http://forge.codelutin.com/repositories/revision/echobase/491 Log: update test data Modified: trunk/echobase-services/src/test/resources/import-data/catches/subsample_all.csv.gz Modified: trunk/echobase-services/src/test/resources/import-data/catches/subsample_all.csv.gz =================================================================== (Binary files differ)

1 0

r490 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase/csv echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv echobase-services/src/test/java/fr/ifremer/echobase/services/importdata echobase-services/src/test/resources/import-data/catches echobase-services/src/test/resources/import-data/common echobase-services/src/test/resources/import-data/operation echobase-services/src/test/resources/import-data/result/region echobase-services/src/test/resources/
by tchemit＠users.forge.codelutin.com 05 Apr '12

05 Apr '12

Author: tchemit Date: 2012-04-05 09:03:36 +0200 (Thu, 05 Apr 2012) New Revision: 490 Url: http://forge.codelutin.com/repositories/revision/echobase/490 Log: refs #1087: Validation des imports (ajout doc + normalisation des imports) Added: trunk/src/site/resources/logo_echobase.png trunk/src/site/rst/imports.rst Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/AbstractImportModel.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchoBaseImport.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java trunk/echobase-services/src/test/resources/import-data/catches/biometrysample.csv.gz trunk/echobase-services/src/test/resources/import-data/catches/subsample.csv.gz trunk/echobase-services/src/test/resources/import-data/catches/totalsample.csv.gz trunk/echobase-services/src/test/resources/import-data/common/transect.csv.gz trunk/echobase-services/src/test/resources/import-data/common/transit.csv.gz trunk/echobase-services/src/test/resources/import-data/operation/gearmetadatavalue.csv.gz trunk/echobase-services/src/test/resources/import-data/operation/operation.csv.gz trunk/echobase-services/src/test/resources/import-data/operation/operationmetadatavalue.csv.gz trunk/echobase-services/src/test/resources/import-data/result/region/regionAssociations.csv.gz trunk/echobase-services/src/test/resources/import-data/result/region/regions.csv.gz trunk/echobase-services/src/test/resources/import-data/result/voyage/echotype.csv.gz trunk/echobase-services/src/test/resources/import-data/result/voyage/lengthAgeKey.csv.gz trunk/src/site/site_fr.xml Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/AbstractImportModel.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/AbstractImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/AbstractImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -35,6 +35,16 @@ public abstract class AbstractImportModel<E> implements ImportModel<E> { + public static final String CELL_NAME = "name"; + + public static final String OPERATION_ID = "operationId"; + + public static final String VESSEL_NAME = "vesselName"; + + public static final String GEAR_CODE = "gearCode"; + + public static final String DEPTH_STRATUM_ID = "depthStratumId"; + private final char separator; protected final ModelBuilder<E> modelBuilder; Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchoBaseImport.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchoBaseImport.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchoBaseImport.java 2012-04-05 07:03:36 UTC (rev 490) @@ -24,25 +24,17 @@ package fr.ifremer.echobase.csv; import com.google.common.base.Charsets; -import org.nuiton.util.StringUtil; import org.nuiton.util.csv.Import; import org.nuiton.util.csv.ImportModel; import org.nuiton.util.csv.ImportRuntimeException; -import org.nuiton.util.csv.ImportableColumn; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import static org.nuiton.i18n.I18n._; - /** * This extends of the {@link Import} offers to allow case on header names. * @@ -68,70 +60,12 @@ } public static <E> EchoBaseImport<E> newImport(ImportModel<E> model, - InputStream inputStream) { - return new EchoBaseImport<E>(model, inputStream); - } - - public static <E> EchoBaseImport<E> newImport(ImportModel<E> model, Reader reader) { return new EchoBaseImport<E>(model, reader); } - public EchoBaseImport(ImportModel<E> importModel, InputStream inputStream) { - super(importModel, inputStream); - } - public EchoBaseImport(ImportModel<E> importModel, Reader reader) { super(importModel, reader); } - @Override - protected void checkAllMandatoryHeadersArePresent(String[] headers) { - - List<String> csvHeaders = new ArrayList<String>(); - for (String header : headers) { - csvHeaders.add(header.toLowerCase()); - } -// Collections.addAll(csvHeaders, headers); - - List<String> mandatoryHeadersNames = new ArrayList<String>(); - for (ImportableColumn<E, ?> field : getAllMandatoryHeaders()) { -// mandatoryHeadersNames.add(field.getHeaderName()); - mandatoryHeadersNames.add(field.getHeaderName().toLowerCase()); - } - mandatoryHeadersNames.removeAll(csvHeaders); - - if (!mandatoryHeadersNames.isEmpty()) { - String validationMessage = - _("csv.import.error.missingMandatoryHeaders", - StringUtil.join(mandatoryHeadersNames, ", ", true)); - throw new ImportRuntimeException(validationMessage); - } - } - - @Override - protected void checkHeaderNamesAreAllKnown(String[] headers) { - List<String> csvHeaders = new ArrayList<String>(); - for (String header : headers) { - csvHeaders.add(header.toLowerCase()); - } -// Collections.addAll(csvHeaders, headers); - - for (ImportableColumn<E, ?> field : model.getColumnsForImport()) { - csvHeaders.remove(field.getHeaderName().toLowerCase()); -// csvHeaders.remove(field.getHeaderName()); - } - if (!csvHeaders.isEmpty()) { - List<String> validHeaderNames = new LinkedList<String>(); - for (ImportableColumn<E, ?> importableColumn : - model.getColumnsForImport()) { - validHeaderNames.add(importableColumn.getHeaderName()); - } - String validationMessage = - _("csv.import.error.unrecognizedHeaders", - StringUtil.join(csvHeaders, ", ", true), - StringUtil.join(validHeaderNames, ", ", true)); - throw new ImportRuntimeException(validationMessage); - } - } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/BiometrySampleImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -46,8 +46,8 @@ Map<String, SampleDataType> sampleDataTypeMap) { super(separator); - newForeignKeyColumn("operationID", BiometrySampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); - newForeignKeyColumn("baracoudacode", BiometrySampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(OPERATION_ID, BiometrySampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); + newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, BiometrySampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); newMandatoryColumn(BiometrySampleImportRow.PROPERTY_NUM_FISH, EchobaseCsvUtil.PRIMITIVE_INTEGER); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EchotypeImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -48,8 +48,8 @@ newMandatoryColumn("echotypeName", Echotype.PROPERTY_NAME); newMandatoryColumn("meaning", Echotype.PROPERTY_MEANING); newForeignKeyColumn(EchotypeImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); - newForeignKeyColumn("DepthStratumID", Echotype.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStratumMap); - newForeignKeyColumn("baracoudacode", Echotype.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(DEPTH_STRATUM_ID, Echotype.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStratumMap); + newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, Echotype.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -46,9 +46,9 @@ public class EsduResultByEchotypeAndSpeciesCategoryImportModel extends AbstractImportModel<EsduResultByEchotypeAndSpeciesCategoryImportRow> { public static final String[] COLUMN_NAMES_TO_EXCLUDE = { - "name", - "baracoudaCode", - "sizeCategory", + CELL_NAME, + Species.PROPERTY_BARACOUDA_CODE, + EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_SIZE_CATEGORY, EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_ECHOTYPE, EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_DATA_QUALITY }; @@ -65,9 +65,9 @@ super(separator); newForeignKeyColumn(EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, echotypeMap); - newForeignKeyColumn("baracoudaCode", EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); newForeignKeyColumn(EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); - newMandatoryColumn("name", EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, esduCellMap)); + newMandatoryColumn(CELL_NAME, EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, esduCellMap)); newForeignKeyColumn(EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_DATA_QUALITY, DataQuality.class, DataQuality.PROPERTY_QUALITY_DATA_FLAG_VALUES, dataQualityMap); for (DataMetadata metadata : dataMetadatas) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -44,7 +44,7 @@ public class EsduResultByEchotypeImportModel extends AbstractImportModel<EsduResultByEchotypeImportRow> { public static final String[] COLUMN_NAMES_TO_EXCLUDE = { - "name", + CELL_NAME, EsduResultByEchotypeImportRow.PROPERTY_ECHOTYPE, EsduResultByEchotypeImportRow.PROPERTY_DATA_QUALITY }; @@ -59,7 +59,7 @@ super(separator); newForeignKeyColumn(EsduResultByEchotypeImportRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, echotypeMap); - newMandatoryColumn("name", EsduResultByEchotypeImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, esduCellMap)); + newMandatoryColumn(CELL_NAME, EsduResultByEchotypeImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, esduCellMap)); newForeignKeyColumn(EsduResultByEchotypeImportRow.PROPERTY_DATA_QUALITY, DataQuality.class, DataQuality.PROPERTY_QUALITY_DATA_FLAG_VALUES, dataQualityMap); for (DataMetadata metadata : dataMetadatas) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -44,8 +44,8 @@ public class EsduResultBySpeciesAndAgeCategoryImportModel extends AbstractImportModel<EsduResultBySpeciesAndAgeCategoryImportRow> { public static final String[] COLUMN_NAMES_TO_EXCLUDE = { - "name", - "baracoudaCode", + CELL_NAME, + Species.PROPERTY_BARACOUDA_CODE, EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY, EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY_MEANING, EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_DATA_QUALITY @@ -60,10 +60,10 @@ Map<String, DataQuality> dataQualityMap) { super(separator); - newMandatoryColumn("name", EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, esduCellMap)); + newMandatoryColumn(CELL_NAME, EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, esduCellMap)); newMandatoryColumn(EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY); newMandatoryColumn(EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY_MEANING); - newForeignKeyColumn("baracoudaCode", EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); newForeignKeyColumn(EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_DATA_QUALITY, DataQuality.class, DataQuality.PROPERTY_QUALITY_DATA_FLAG_VALUES, dataQualityMap); for (DataMetadata metadata : dataMetadatas) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -44,8 +44,8 @@ public class EsduResultBySpeciesAndSizeCategoryImportModel extends AbstractImportModel<EsduResultBySpeciesAndSizeCategoryImportRow> { public static final String[] COLUMN_NAMES_TO_EXCLUDE = { - "name", - "baracoudaCode", + CELL_NAME, + Species.PROPERTY_BARACOUDA_CODE, EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY, EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY_MEANING, EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_DATA_QUALITY @@ -60,10 +60,10 @@ Map<String, DataQuality> dataQualityMap) { super(separator); - newMandatoryColumn("name", EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, esduCellMap)); + newMandatoryColumn(CELL_NAME, EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_CELL, EchobaseCsvUtil.newCellValueParser(voyage, esduCellMap)); newMandatoryColumn(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY); newMandatoryColumn(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY_MEANING); - newForeignKeyColumn("baracoudaCode", EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); newForeignKeyColumn(EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_DATA_QUALITY, DataQuality.class, DataQuality.PROPERTY_QUALITY_DATA_FLAG_VALUES, dataQualityMap); for (DataMetadata metadata : dataMetadatas) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/GearMetadataValueImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -40,6 +40,7 @@ */ public class GearMetadataValueImportModel extends AbstractImportModel<GearMetadataValueImportRow> { + public GearMetadataValueImportModel(char separator, Map<String, Vessel> vesselMap, Map<String, GearMetadata> gearMetadataMap, @@ -47,11 +48,11 @@ Map<String, Operation> operationMap) { super(separator); - newForeignKeyColumn("vesselName", GearMetadataValueImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); - newForeignKeyColumn("operationID", GearMetadataValueImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); + newForeignKeyColumn(VESSEL_NAME, GearMetadataValueImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); + newForeignKeyColumn(OPERATION_ID, GearMetadataValueImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); newForeignKeyColumn("metadataType", GearMetadataValue.PROPERTY_GEAR_METADATA, GearMetadata.class, GearMetadata.PROPERTY_NAME, gearMetadataMap); - newForeignKeyColumn("gearCode", GearMetadataValue.PROPERTY_GEAR, Gear.class, Gear.PROPERTY_CASINO_GEAR_NAME, gearMap); + newForeignKeyColumn(GEAR_CODE, GearMetadataValue.PROPERTY_GEAR, Gear.class, Gear.PROPERTY_CASINO_GEAR_NAME, gearMap); newMandatoryColumn("gearMetadataValue", GearMetadataValue.PROPERTY_DATA_VALUE); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthAgeKeyImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -53,7 +53,7 @@ newMandatoryColumn(LengthAgeKey.PROPERTY_LENGTH, EchobaseCsvUtil.PRIMITIVE_FLOAT); newMandatoryColumn(LengthAgeKey.PROPERTY_METADATA); newForeignKeyColumn(LengthAgeKey.PROPERTY_STRATA, Strata.class, Strata.PROPERTY_NAME, strataMap); - newForeignKeyColumn("baracoudacode", LengthAgeKey.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, LengthAgeKey.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); } @Override Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/LengthWeightKeyImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -50,7 +50,7 @@ newForeignKeyColumn(LengthWeightKeyImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); newForeignKeyColumn(LengthWeightKeyImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); - newForeignKeyColumn("baracoudaCode", LengthWeightKeyImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, LengthWeightKeyImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); } @Override Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/MapCellImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -46,7 +46,7 @@ public static final String[] COLUMN_NAMES_TO_EXCLUDE = { MapCellImportRow.PROPERTY_NAME, - "baracoudaCode", + Species.PROPERTY_BARACOUDA_CODE, MapCellImportRow.PROPERTY_DATA_GRID_CELL_LONGITUDE, MapCellImportRow.PROPERTY_DATA_GRID_CELL_LATITUDE, MapCellImportRow.PROPERTY_DATA_GRID_CELL_DEPTH, @@ -74,9 +74,9 @@ newForeignKeyColumn(MapCellImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); newMandatoryColumn(MapCellImportRow.PROPERTY_NAME); - newForeignKeyColumn("baracoudaCode", MapCellImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, MapCellImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); newForeignKeyColumn(MapCellImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); - newForeignKeyColumn(MapCellImportRow.PROPERTY_AGE_CATEGORY, AgeCategory.class, SizeCategory.PROPERTY_NAME, ageCategoryMap); + newForeignKeyColumn(MapCellImportRow.PROPERTY_AGE_CATEGORY, AgeCategory.class, AgeCategory.PROPERTY_NAME, ageCategoryMap); newForeignKeyColumn(MapCellImportRow.PROPERTY_DATA_QUALITY, DataQuality.class, DataQuality.PROPERTY_QUALITY_DATA_FLAG_VALUES, dataQualityMap); newMandatoryColumn(MapCellImportRow.PROPERTY_DATA_GRID_CELL_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -46,11 +46,11 @@ Map<String, DepthStratum> depthStratumMap) { super(separator); - newForeignKeyColumn("vesselName", OperationImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); + newForeignKeyColumn(VESSEL_NAME, OperationImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); - newForeignKeyColumn("gearCode", Operation.PROPERTY_GEAR, Gear.class, Gear.PROPERTY_CASINO_GEAR_NAME, gearMap); - newForeignKeyColumn("depthStratumID", Operation.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStratumMap); - newMandatoryColumn("operationID", Operation.PROPERTY_ID); + newForeignKeyColumn(GEAR_CODE, Operation.PROPERTY_GEAR, Gear.class, Gear.PROPERTY_CASINO_GEAR_NAME, gearMap); + newForeignKeyColumn(DEPTH_STRATUM_ID, Operation.PROPERTY_DEPTH_STRATUM, DepthStratum.class, DepthStratum.PROPERTY_ID, depthStratumMap); + newMandatoryColumn(OPERATION_ID, Operation.PROPERTY_ID); newMandatoryColumn(Operation.PROPERTY_MID_HAUL_LATITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); newMandatoryColumn(Operation.PROPERTY_MID_HAUL_LONGITUDE, EchobaseCsvUtil.PRIMITIVE_FLOAT); newMandatoryColumn(Operation.PROPERTY_GEAR_SHOOTING_START_TIME, EchobaseCsvUtil.DAY_TIME_SECOND); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/OperationMetadataValueImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -45,8 +45,8 @@ Map<String, Operation> operationMap) { super(separator); - newForeignKeyColumn("vesselName", OperationMetadataValueImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); - newForeignKeyColumn("operationID", OperationMetadataValueImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); + newForeignKeyColumn(VESSEL_NAME, OperationMetadataValueImportRow.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); + newForeignKeyColumn(OPERATION_ID, OperationMetadataValueImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); newForeignKeyColumn("metadataType", OperationMetadataValue.PROPERTY_OPERATION_METADATA, OperationMetadata.class, OperationMetadata.PROPERTY_NAME, operationMetadataMap); newMandatoryColumn("operationMetadataValue", OperationMetadataValue.PROPERTY_DATA_VALUE); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellAssociationImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -46,8 +46,8 @@ CellDAO cellDAO) { super(separator); newForeignKeyColumn(RegionCellAssociationImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); - newForeignKeyColumn("region.name", RegionCellAssociationImportRow.PROPERTY_REGION_CELL, Cell.class, Cell.PROPERTY_NAME, regionCellMap); - newMandatoryColumn("esdu.name", RegionCellAssociationImportRow.PROPERTY_ESDU_CELL, EchobaseCsvUtil.newCellValueParser(voyage, cellDAO)); + newForeignKeyColumn("regionName", RegionCellAssociationImportRow.PROPERTY_REGION_CELL, Cell.class, Cell.PROPERTY_NAME, regionCellMap); + newMandatoryColumn("esduName", RegionCellAssociationImportRow.PROPERTY_ESDU_CELL, EchobaseCsvUtil.newCellValueParser(voyage, cellDAO)); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/RegionCellResultImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -44,9 +44,11 @@ */ public class RegionCellResultImportModel extends AbstractImportModel<RegionCellResultImportRow> { + + public static final String[] COLUMN_NAMES_TO_EXCLUDE = { - "name", - "baracoudaCode", + CELL_NAME, + Species.PROPERTY_BARACOUDA_CODE, RegionCellResultImportRow.PROPERTY_VOYAGE, RegionCellResultImportRow.PROPERTY_SIZE_CATEGORY, RegionCellResultImportRow.PROPERTY_ECHOTYPE, @@ -65,9 +67,9 @@ super(separator); newForeignKeyColumn(RegionCellResultImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); - newForeignKeyColumn("name", RegionCellResultImportRow.PROPERTY_CELL, Cell.class, Cell.PROPERTY_NAME, regionCellMap); + newForeignKeyColumn(CELL_NAME, RegionCellResultImportRow.PROPERTY_CELL, Cell.class, Cell.PROPERTY_NAME, regionCellMap); newForeignKeyColumn(RegionCellResultImportRow.PROPERTY_ECHOTYPE, Echotype.class, Echotype.PROPERTY_NAME, echotypeMap); - newForeignKeyColumn("baracoudaCode", RegionCellResultImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, RegionCellResultImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); newForeignKeyColumn(RegionCellResultImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); newForeignKeyColumn(RegionCellResultImportRow.PROPERTY_DATA_QUALITY, DataQuality.class, DataQuality.PROPERTY_QUALITY_DATA_FLAG_VALUES, dataQualityMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/SubSampleImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -53,8 +53,8 @@ newIgnoredColumn("units"); newIgnoredColumn("round"); - newForeignKeyColumn("operationID", SubSampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); - newForeignKeyColumn("baracoudacode", SubSampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(OPERATION_ID, SubSampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); + newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, SubSampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); newForeignKeyColumn(SubSampleImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); newForeignKeyColumn(SubSampleImportRow.PROPERTY_SEX_CATEGORY, SexCategory.class, SexCategory.PROPERTY_NAME, sexCategoryMap); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TotalSampleImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -46,8 +46,8 @@ Map<String, SizeCategory> sizeCategoryMap) { super(separator); - newForeignKeyColumn("operationID", TotalSampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); - newForeignKeyColumn("baracoudacode", TotalSampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); + newForeignKeyColumn(OPERATION_ID, TotalSampleImportRow.PROPERTY_OPERATION, Operation.class, Operation.PROPERTY_ID, operationMap); + newForeignKeyColumn(Species.PROPERTY_BARACOUDA_CODE, TotalSampleImportRow.PROPERTY_SPECIES, Species.class, Species.PROPERTY_BARACOUDA_CODE, speciesMap); newForeignKeyColumn(TotalSampleImportRow.PROPERTY_SIZE_CATEGORY, SizeCategory.class, SizeCategory.PROPERTY_NAME, sizeCategoryMap); newMandatoryColumn(Sample.PROPERTY_SAMPLE_WEIGHT, EchobaseCsvUtil.PRIMITIVE_FLOAT); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransectImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -44,11 +44,11 @@ Map<String, Vessel> vesselMap) { super(separator); newForeignKeyColumn( - "voyageName", TransectImportRow.PROPERTY_VOYAGE, + TransectImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); newForeignKeyColumn( - "vesselName", Transect.PROPERTY_VESSEL, + VESSEL_NAME, Transect.PROPERTY_VESSEL, Vessel.class, Vessel.PROPERTY_NAME, vesselMap); newMandatoryColumn(Transect.PROPERTY_TITLE); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/TransitImportModel.java 2012-04-05 07:03:36 UTC (rev 490) @@ -41,7 +41,7 @@ public TransitImportModel(char separator, Map<String, Voyage> voyageMap) { super(separator); - newForeignKeyColumn("voyageName", TransitImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); + newForeignKeyColumn(TransitImportRow.PROPERTY_VOYAGE, Voyage.class, Voyage.PROPERTY_NAME, voyageMap); newMandatoryColumn(Transit.PROPERTY_DESCRIPTION); newMandatoryColumn(Transit.PROPERTY_START_TIME, EchobaseCsvUtil.DAY_TIME); newMandatoryColumn(Transit.PROPERTY_END_TIME, EchobaseCsvUtil.DAY_TIME); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2012-04-05 07:03:36 UTC (rev 490) @@ -327,7 +327,7 @@ File file) { super(separator); - newMandatoryColumn(esduColumnName, "name"); + newMandatoryColumn(esduColumnName, CELL_NAME); String[] header = EchoBaseImport.getHeader(file, separator); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesImportServiceIT.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/CatchesImportServiceIT.java 2012-04-05 07:03:36 UTC (rev 490) @@ -26,6 +26,7 @@ import fr.ifremer.echobase.csv.CsvFileImportResult; import fr.ifremer.echobase.entities.data.Sample; import fr.ifremer.echobase.entities.data.SampleData; +import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; import org.junit.Ignore; import org.junit.Test; @@ -72,9 +73,11 @@ assertCsvImportResult(result, 0, Sample.class, NB_SAMPLE_TOTAL, 0, NB_SAMPLE); assertCsvImportResult(result, 0, SampleData.class, NB_SAMPLE_DATA_TOTAL, 0, NB_SAMPLE_DATA); + assertCsvImportResult(result, 0, SpeciesCategory.class, 4,0,456); assertCsvImportResult(result, 1, Sample.class, NB_SAMPLE_UNSORTED, 0, NB_SAMPLE); assertCsvImportResult(result, 1, SampleData.class, NB_SAMPLE_DATA_UNSORTED, 0, NB_SAMPLE_DATA); + assertCsvImportResult(result, 1, SpeciesCategory.class, 9, 0, 456); assertCsvImportResult(result, 2, Sample.class, NB_SAMPLE_BIOMETRY, 0, NB_SAMPLE); assertCsvImportResult(result, 2, SampleData.class, NB_SAMPLE_DATA_BIOMETRY, 0, NB_SAMPLE_DATA); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportServiceIT.java 2012-04-05 07:03:36 UTC (rev 490) @@ -24,6 +24,7 @@ package fr.ifremer.echobase.services.importdata; import fr.ifremer.echobase.InputFile; +import fr.ifremer.echobase.csv.AbstractImportModel; import fr.ifremer.echobase.csv.CsvFileImportResult; import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Result; @@ -72,7 +73,7 @@ InputFile inputFile = conf.getEsduByEchotypeFile(); prepareInputFile(inputFile, getImportPath("byEchotype.csv.gz")); - addMissingEsduCells("name", conf.getVoyageId(), inputFile); + addMissingEsduCells(AbstractImportModel.CELL_NAME, conf.getVoyageId(), inputFile); conf.setDataProcessingId(getDataProcessingId()); @@ -104,7 +105,7 @@ prepareInputFile(inputFile, getImportPath("byEchotypeAndSpeciesCategory.csv.gz")); - addMissingEsduCells("name", conf.getVoyageId(), inputFile); + addMissingEsduCells(AbstractImportModel.CELL_NAME, conf.getVoyageId(), inputFile); conf.setDataProcessingId(getDataProcessingId()); @@ -137,7 +138,7 @@ prepareInputFile(intputFile, getImportPath("bySpeciesAndSizeCategory.csv.gz")); - addMissingEsduCells("name", conf.getVoyageId(), intputFile); + addMissingEsduCells(AbstractImportModel.CELL_NAME, conf.getVoyageId(), intputFile); conf.setDataProcessingId(getDataProcessingId()); @@ -171,7 +172,7 @@ prepareInputFile(inputFile, getImportPath("bySpeciesAndAgeCategory.csv.gz")); - addMissingEsduCells("name", conf.getVoyageId(), inputFile); + addMissingEsduCells(AbstractImportModel.CELL_NAME, conf.getVoyageId(), inputFile); conf.setDataProcessingId(getDataProcessingId()); Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportServiceIT.java 2012-04-05 07:03:36 UTC (rev 490) @@ -75,7 +75,7 @@ prepareInputFile(conf.getRegionResultFile(), getImportPath("regionResults.csv.gz")); - addMissingEsduCells("esdu.name", + addMissingEsduCells("esduName", conf.getVoyageId(), conf.getRegionAssociationFile()); Modified: trunk/echobase-services/src/test/resources/import-data/catches/biometrysample.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/catches/subsample.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/catches/totalsample.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/common/transect.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/common/transit.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/operation/gearmetadatavalue.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/operation/operation.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/operation/operationmetadatavalue.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/result/region/regionAssociations.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/result/region/regions.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/result/voyage/echotype.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/test/resources/import-data/result/voyage/lengthAgeKey.csv.gz =================================================================== (Binary files differ) Copied: trunk/src/site/resources/logo_echobase.png (from rev 489, trunk/echobase-ui/src/main/webapp/images/logo_echobase.png) =================================================================== (Binary files differ) Added: trunk/src/site/rst/imports.rst =================================================================== --- trunk/src/site/rst/imports.rst (rev 0) +++ trunk/src/site/rst/imports.rst 2012-04-05 07:03:36 UTC (rev 490) @@ -0,0 +1,305 @@ +.. - +.. * #%L +.. * EchoBase +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2011 - 2012 Ifremer, Codelutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - +======================================= +Liste des colonnes des imports EchoBase +======================================= + +Ce document donne la définition de tous les imports. + +Sur les types : + +- FK(XXX#yyy) désigne une clef étrangères requise (XXX sur la propriété yyy). +- (int) un entier (pas du nulitté possible) +- (float) un décimal (pas de nullité possible) +- (Integer) un entier avec nullité possible +- (Integer-NA) un entier avec nullité possible (et nullité si NA) +- Float un décimale avec nullité possible +- (Float-NA) un décimale avec nullité possible (et nullité si NA) +- (day) date au format dd/MM/yyyy +- (date - time) date au format dd/MM/yyyy HH:mm +- (date - time 2) date au format yyyy-MM-dd HH:mm:ss +- (date time second) date au format dd/MM/yyyy HH:mm:ss +- (esdu cell) nom de cellule esdu - elementary : esduName[_elementaryName) + avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS + +Voyage / Transit / Transect +--------------------------- + +Voyage +~~~~~~ + +- name +- startDate (day) +- endDate (day) +- startPort +- endPort + +Transit +~~~~~~~ + +- voyage FK(voyage#name) +- description +- startTime (date - time) +- endTime (date - time) +- startLocality +- endLocality + +Transect +~~~~~~~~ + +- voyage FK(voyage#name) +- vesselName FK(Vessel#name) +- title +- transectAbstract +- stratum +- comment +- dateCreated (date - time 2) +- timeCoverageStart (date - time 2) +- timeCoverageEnd (date - time 2) +- geospatialLonMin (float) +- geospatialLonMax (float) +- geospatialLatMin (float) +- geospatialLatMax (float) +- geospatialVerticalMin (float) +- geospatialVerticalMax (float) +- linestring + +Operation / OperationMetadataValue / GearMetadataValue +------------------------------------------------------ + +Operation +~~~~~~~~~ + +- vesselName FK(Vessel#name) +- gearCode FK(Gear#casinoGearName) +- depthStratumId FK(DepthStratum#id) +- operationId +- midHaulLatitude (float) +- midHaulLongitude (float) +- gearShootingStartTime (date time second) +- gearShootingEndTime (date time second) +- gearShootingStartLatitude (float) +- gearShootingEndLatitude (float) +- gearShootingStartLongitude (float) +- gearShootingEndLongitude (float) + +OperationMetadataValue +~~~~~~~~~~~~~~~~~~~~~~ + +- vesselName FK(Vessel#name) +- operationId FK(Operation#id) +- metadataType FK(OperationMetadata#name) +- operationMetadataValue + +GearMetadataValue +~~~~~~~~~~~~~~~~~ + +- vesselName FK(Vessel#name) +- operationId FK(Operation#id) +- metadataType FK(GearMetadata#name) +- gearCode FK(Gear#casinoGearName) +- gearMetadataValue + +TotalSample / SubSample / BiometrySample +------- + +TotalSample +~~~~~~~~~~~ + +- operationId FK(Operation#id) +- baracoudaCode FK(Species#baracoudaCode) +- sizeCategory FK(SizeCategory#name) +- sampleWeight (float) +- numberSampled (Integer-NA) +- meanLength (Float-NA) +- meanWeight (Float-NA) +- noPerKg (Float-NA) +- sortedWeight (float) + +SubSample +~~~~~~~~~ + +- operationId FK(Operation#id) +- baracoudaCode FK(Species#baracoudaCode) +- sizeCategory FK(SizeCategory#name) +- sexCategory FK(SexCategory#name) +- sampleWeight (float) +- numberSampled (int) +- numberAtLength (float) +- weightAtLength (Float-NA) +- lengthClass + +(colonnes ignorées) subHaul units round + +BiometrySample +~~~~~~~~~~~~~~ + +- operationId FK(Operation#id) +- baracoudaCode FK(Species#baracoudaCode) +- numFish (int) +- name FK(SampleDataType#name) +- dataLabel +- dataValue (Float-NA) + +Acoustic +-------- + +A faire... + +Résultats voyage +---------------- + +Echotype +~~~~~~~~ + +- echotypeName +- meaning +- voyage FK(Voyage#name) +- depthStratumId FK(DepthStratum#id) +- baracoudaCode FK(Species#baracoudaCode) + +LengthWeightKey +~~~~~~~~~~~~~~~ + +- aParameter (float) +- bParameter (float) +- voyage FK(Voyage#name) +- sizeCategory FK(SizeCategory#name) +- baracoudaCode FK(Species#baracoudaCode) + +LengthAgeKey +~~~~~~~~~~~~ + +- voyage FK(Voyage#name) +- age (int) +- length (float) +- percentAtAge (float) +- metadata +- strata FK(Strata#name) +- baracoudaCode FK(Species#baracoudaCode) + +Résultats Esdu +-------------- + +Esdu / Echotype +~~~~~~~~~~~~~~~ + +- name FK(esdu cell) +- echotype FK(Echotype#name) +- dataQuality FK(DataQuality#qualityDataFlagValues) +- ... DataMetadata#name ... + +Esdu / Echotype / Species Category +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- name FK(esdu cell) +- echotype FK(Echotype#name) +- sizeCategory FK(SizeCategory#name) +- baracoudaCode FK(Species#baracoudaCode) +- dataQuality FK(DataQuality#qualityDataFlagValues) +- ... DataMetadata#name ... + +Esdu / Species / Age Category +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- name FK(esdu cell) +- baracoudaCode FK(Species#baracoudaCode) +- ageCategory +- ageCategoryMeaning +- dataQuality FK(DataQuality#qualityDataFlagValues) +- ... DataMetadata#name ... + +Esdu / Species / Size Category +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +- name FK(esdu cell) +- baracoudaCode FK(Species#baracoudaCode) +- sizeCategory +- sizeategoryMeaning +- dataQuality FK(DataQuality#qualityDataFlagValues) +- ... DataMetadata#name ... + +Region +------ + +Region +~~~~~~ + +- voyage FK(Voyage#name) +- cellType FK(CellType) +- dataQuality FK(DataQuality#qualityDataFlagValues) +- name +- regionEnvCoordinates +- surface (float) + +Region Association +~~~~~~~~~~~~~~~~~~ + +- voyage FK(Voyage) +- regionName FK(Cell#name) +- esduName FK(Cell#name) + +Region results +~~~~~~~~~~~~~~ + +- voyage FK(Voyage#name) +- name FK(Cell#name) +- baracoudaCode FK(Species#baracoudaCode) +- echotype FK(Echotype#name) +- sizeCategory FK(SizeCategory#name) +- dataQuality FK(DataQuality#qualityDataFlagValues) +- ... DataMetadata#name ... + +Map +--- + +- voyage FK(Voyage#name) +- name +- baracoudaCode FK(Species#baracoudaCode) +- sizeCategory FK(SizeCategory#name) +- ageCategory FK(AgeCategory#name) +- dataQuality FK(DataQuality#qualityDataFlagValues) +- gridCellLongitude (float) +- gridCellLatitude (float) +- gridCellDepth (float) +- gridLongitudeLag (float) +- gridLatitudeLag (float) +- gridDepthLag (float) +- ... DataMetadata#name ... + + + + + + + + + + + + + + + + Property changes on: trunk/src/site/rst/imports.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-04 14:55:17 UTC (rev 489) +++ trunk/src/site/site_fr.xml 2012-04-05 07:03:36 UTC (rev 490) @@ -25,6 +25,12 @@ <project name="${project.name}"> + <bannerLeft> + <name>${project.name}</name> + <src>./logo_echobase.png</src> + <href>index.html</href> + </bannerLeft> + <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> @@ -60,6 +66,7 @@ <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Installation" href="install.html"/> + <item name="Les imports" href="imports.html"/> <item name="Téléchargement" href="http://forge.codelutin.com/projects/echobase/files"/> <item name="Roadmap"

1 0

r489 - trunk/echobase-entities/src/main/xmi
by tchemit＠users.forge.codelutin.com 04 Apr '12

04 Apr '12

Author: tchemit Date: 2012-04-04 16:55:17 +0200 (Wed, 04 Apr 2012) New Revision: 489 Url: http://forge.codelutin.com/repositories/revision/echobase/489 Log: fixes #1085: Les clefs naturels ne sont pas mutables\! Modified: trunk/echobase-entities/src/main/xmi/echobase.properties Modified: trunk/echobase-entities/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase.properties 2012-04-04 14:04:32 UTC (rev 488) +++ trunk/echobase-entities/src/main/xmi/echobase.properties 2012-04-04 14:55:17 UTC (rev 489) @@ -60,7 +60,7 @@ ### Natural id for references ################################################ ############################################################################### -fr.ifremer.echobase.entities.EchoBaseUser.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.EchoBaseUser.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.EchoBaseUser.attribute.email.tagValue.naturalId=true fr.ifremer.echobase.entities.EchoBaseUser.attribute.email.tagValue.notNull=true fr.ifremer.echobase.entities.EchoBaseUser.attribute.password.tagValue.notNull=true @@ -71,143 +71,143 @@ fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationDate.tagValue.notNull=true fr.ifremer.echobase.entities.EntityModificationLog.attribute.modificationUser.tagValue.notNull=true -fr.ifremer.echobase.entities.ExportQuery.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.ExportQuery.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.ExportQuery.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.ExportQuery.attribute.description.tagValue.notNull=true fr.ifremer.echobase.entities.ExportQuery.attribute.sqlQuery.tagValue.notNull=true fr.ifremer.echobase.entities.ExportQuery.attribute.lastModifiedDate.tagValue.notNull=true fr.ifremer.echobase.entities.ExportQuery.attribute.lastModifiedUser.tagValue.notNull=true -fr.ifremer.echobase.entities.references.AcousticInstrument.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.AcousticInstrument.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.AcousticInstrument.attribute.id.tagValue.naturalId=true fr.ifremer.echobase.entities.references.AcousticInstrument.attribute.id.tagValue.notNull=true -fr.ifremer.echobase.entities.references.AgeCategory.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.AgeCategory.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.AgeCategory.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.AgeCategory.attribute.name.tagValue.notNull=true fr.ifremer.echobase.entities.references.AgeCategory.attribute.meaning.tagValue.notNull=true -fr.ifremer.echobase.entities.references.AreaOfOperation.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.AreaOfOperation.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.AreaOfOperation.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.AreaOfOperation.attribute.name.tagValue.notNull=true -#fr.ifremer.echobase.entities.references.Calibration.class.tagValue.naturalIdMutable=false +#fr.ifremer.echobase.entities.references.Calibration.class.tagValue.naturalIdMutable=true #fr.ifremer.echobase.entities.references.Calibration.attribute.code.tagValue.naturalId=true -fr.ifremer.echobase.entities.references.CategoryMeaning.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.CategoryMeaning.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.CategoryMeaning.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.CategoryMeaning.attribute.name.tagValue.notNull=true -#fr.ifremer.echobase.entities.references.CategoryRef.class.tagValue.naturalIdMutable=false +#fr.ifremer.echobase.entities.references.CategoryRef.class.tagValue.naturalIdMutable=true #fr.ifremer.echobase.entities.references.CategoryRef.attribute.code.tagValue.naturalId=true -fr.ifremer.echobase.entities.references.CategoryType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.CategoryType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.CategoryType.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.CategoryType.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.CellMethod.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.CellMethod.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.CellMethod.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.CellMethod.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.CellType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.CellType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.CellType.attribute.id.tagValue.naturalId=true fr.ifremer.echobase.entities.references.CellType.attribute.id.tagValue.notNull=true -fr.ifremer.echobase.entities.references.DataMetadata.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.DataMetadata.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.DataMetadata.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.DataMetadata.attribute.name.tagValue.notNull=true -#fr.ifremer.echobase.entities.references.DataProtocol.class.tagValue.naturalIdMutable=false +#fr.ifremer.echobase.entities.references.DataProtocol.class.tagValue.naturalIdMutable=true #fr.ifremer.echobase.entities.references.DataProtocol.attribute.code.tagValue.naturalId=true -#fr.ifremer.echobase.entities.references.DataQuality.class.tagValue.naturalIdMutable=false +#fr.ifremer.echobase.entities.references.DataQuality.class.tagValue.naturalIdMutable=true #fr.ifremer.echobase.entities.references.DataQuality.attribute.code.tagValue.naturalId=true -fr.ifremer.echobase.entities.references.DataType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.DataType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.DataType.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.DataType.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.DepthStratum.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.DepthStratum.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.DepthStratum.attribute.id.tagValue.naturalId=true fr.ifremer.echobase.entities.references.DepthStratum.attribute.id.tagValue.notNull=true -fr.ifremer.echobase.entities.references.EchotypeCategory.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.EchotypeCategory.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.EchotypeCategory.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.EchotypeCategory.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.Gear.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.Gear.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.Gear.attribute.casinoGearName.tagValue.naturalId=true fr.ifremer.echobase.entities.references.Gear.attribute.casinoGearName.tagValue.notNull=true -fr.ifremer.echobase.entities.references.GearCharacteristic.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.GearCharacteristic.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.GearCharacteristic.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.GearCharacteristic.attribute.name.tagValue.notNull=true -#fr.ifremer.echobase.entities.references.GearCharacteristicValue.class.tagValue.naturalIdMutable=false +#fr.ifremer.echobase.entities.references.GearCharacteristicValue.class.tagValue.naturalIdMutable=true #fr.ifremer.echobase.entities.references.GearCharacteristicValue.attribute.code.tagValue.naturalId=true -fr.ifremer.echobase.entities.references.GearMetadata.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.GearMetadata.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.GearMetadata.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.GearMetadata.attribute.name.tagValue.notNull=true -#fr.ifremer.echobase.entities.references.Impacte.class.tagValue.naturalIdMutable=false +#fr.ifremer.echobase.entities.references.Impacte.class.tagValue.naturalIdMutable=true #fr.ifremer.echobase.entities.references.Impacte.attribute.code.tagValue.naturalId=true -fr.ifremer.echobase.entities.references.MeasurementMetadata.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.MeasurementMetadata.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.MeasurementMetadata.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.MeasurementMetadata.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.MeasureType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.MeasureType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.MeasureType.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.MeasureType.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.Mission.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.Mission.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.Mission.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.Mission.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.OperationEvent.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.OperationEvent.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.OperationEvent.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.OperationEvent.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.OperationMetadata.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.OperationMetadata.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.OperationMetadata.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.OperationMetadata.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.ReferenceDatum.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.ReferenceDatum.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.ReferenceDatum.attribute.id.tagValue.naturalId=true fr.ifremer.echobase.entities.references.ReferenceDatum.attribute.id.tagValue.notNull=true -fr.ifremer.echobase.entities.references.ReferenceDatumType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.ReferenceDatumType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.ReferenceDatumType.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.ReferenceDatumType.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.ReferencingMethod.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.ReferencingMethod.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.ReferencingMethod.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.ReferencingMethod.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.SampleDataType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.SampleDataType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.SampleDataType.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.SampleDataType.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.SampleType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.SampleType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.SampleType.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.SampleType.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.SexCategory.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.SexCategory.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.SexCategory.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.SexCategory.attribute.name.tagValue.notNull=true fr.ifremer.echobase.entities.references.SexCategory.attribute.meaning.tagValue.notNull=true -fr.ifremer.echobase.entities.references.SizeCategory.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.SizeCategory.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.SizeCategory.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.SizeCategory.attribute.name.tagValue.notNull=true fr.ifremer.echobase.entities.references.SizeCategory.attribute.meaning.tagValue.notNull=true -fr.ifremer.echobase.entities.references.Species.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.Species.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.Species.attribute.baracoudaCode.tagValue.naturalId=true fr.ifremer.echobase.entities.references.Species.attribute.baracoudaCode.tagValue.notNull=true -fr.ifremer.echobase.entities.references.SpeciesCategory.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.SpeciesCategory.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.SpeciesCategory.attribute.species.tagValue.naturalId=true fr.ifremer.echobase.entities.references.SpeciesCategory.attribute.sizeCategory.tagValue.naturalId=true fr.ifremer.echobase.entities.references.SpeciesCategory.attribute.ageCategory.tagValue.naturalId=true @@ -217,18 +217,18 @@ fr.ifremer.echobase.entities.references.SpeciesCategory.attribute.ageCategory.tagValue.notNull=false fr.ifremer.echobase.entities.references.SpeciesCategory.attribute.sexCategory.tagValue.notNull=false -fr.ifremer.echobase.entities.references.Strata.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.Strata.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.Strata.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.Strata.attribute.name.tagValue.notNull=true -#fr.ifremer.echobase.entities.references.TSParameters.class.tagValue.naturalIdMutable=false +#fr.ifremer.echobase.entities.references.TSParameters.class.tagValue.naturalIdMutable=true #fr.ifremer.echobase.entities.references.TSParameters.attribute.code.tagValue.naturalId=true -fr.ifremer.echobase.entities.references.Vessel.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.Vessel.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.Vessel.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.Vessel.attribute.name.tagValue.notNull=true -fr.ifremer.echobase.entities.references.VesselType.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.references.VesselType.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.references.VesselType.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.references.VesselType.attribute.name.tagValue.notNull=true @@ -236,7 +236,7 @@ ### Natural id for data ###################################################### ############################################################################### -fr.ifremer.echobase.entities.data.Category.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.data.Category.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.data.Category.attribute.depthStratum.tagValue.naturalId=true fr.ifremer.echobase.entities.data.Category.attribute.echotype.tagValue.naturalId=true fr.ifremer.echobase.entities.data.Category.attribute.speciesCategory.tagValue.naturalId=true @@ -303,7 +303,7 @@ fr.ifremer.echobase.entities.data.Transit.attribute.description.tagValue.notNull=true fr.ifremer.echobase.entities.data.Transit.attribute.relatedActivity.tagValue.notNull=true -fr.ifremer.echobase.entities.data.Voyage.class.tagValue.naturalIdMutable=false +fr.ifremer.echobase.entities.data.Voyage.class.tagValue.naturalIdMutable=true fr.ifremer.echobase.entities.data.Voyage.attribute.name.tagValue.naturalId=true fr.ifremer.echobase.entities.data.Voyage.attribute.name.tagValue.notNull=true fr.ifremer.echobase.entities.data.Voyage.attribute.startDate.tagValue.notNull=true

1 0

r488 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase echobase-entities/src/main/resources echobase-services/src/main/resources/embedded echobase-ui/src/main/java/fr/ifremer/echobase/ui echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions echobase-ui/src/main/resources
by tchemit＠users.forge.codelutin.com 04 Apr '12

04 Apr '12

Author: tchemit Date: 2012-04-04 16:04:32 +0200 (Wed, 04 Apr 2012) New Revision: 488 Url: http://forge.codelutin.com/repositories/revision/echobase/488 Log: refs #1084: Apr?\195?\168s un import en erreur, impossible d'en recommencer un (am?\195?\169lioration) Removed: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java Modified: trunk/echobase-entities/src/main/resources/topia-h2.properties trunk/echobase-services/src/main/resources/embedded/echobase.properties trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java trunk/echobase-ui/src/main/resources/echobase.properties Deleted: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java 2012-04-04 11:06:54 UTC (rev 487) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java 2012-04-04 14:04:32 UTC (rev 488) @@ -1,87 +0,0 @@ -/* - * #%L - * EchoBase :: Entities - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.framework.TopiaConnectionProvider; - -import java.sql.Connection; -import java.sql.SQLException; - -/** - * To fix roolback errors. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.6 - */ -public class EchoBaseTopiaConnectionProvider extends TopiaConnectionProvider { - - /** Logger. */ - private static final Log log = LogFactory.getLog(EchoBaseTopiaConnectionProvider.class); - - @Override - public void closeConnection(Connection conn) throws SQLException { - - // if connection is already closed, nothing has to be done - // we can't keep this connection (and can not be push in pool) - - if (conn.isClosed()) { - - if (log.isDebugEnabled()) { - log.debug("Connection [" + conn + - "] alreay closed!, will not use it any longer "); - } - return; - } - - - // connection was not closed, can push it in the pool (if pool is not - // full) - - synchronized (getPool()) { - int currentSize = getPool().size(); - if (currentSize < getPoolSize()) { - if (log.isTraceEnabled()) { - log.trace("returning connection to pool, pool size: " + - (currentSize + 1)); - } - - // make sure connection is always rollback before keep it - conn.rollback(); - - getPool().add(conn); - return; - } - } - - // pool was full, must release the connection which will be loose - - if (log.isDebugEnabled()) { - log.debug("closing JDBC connection"); - } - - conn.close(); - } -} Modified: trunk/echobase-entities/src/main/resources/topia-h2.properties =================================================================== --- trunk/echobase-entities/src/main/resources/topia-h2.properties 2012-04-04 11:06:54 UTC (rev 487) +++ trunk/echobase-entities/src/main/resources/topia-h2.properties 2012-04-04 14:04:32 UTC (rev 488) @@ -28,5 +28,4 @@ hibernate.connection.driver_class=org.h2.Driver hibernate.connection.username=sa hibernate.connection.password=sa -hibernate.connection.provider_class=fr.ifremer.echobase.EchoBaseTopiaConnectionProvider -#hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider +hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider Modified: trunk/echobase-services/src/main/resources/embedded/echobase.properties =================================================================== --- trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-04-04 11:06:54 UTC (rev 487) +++ trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-04-04 14:04:32 UTC (rev 488) @@ -29,8 +29,8 @@ war.directory=${data.directory} -hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.username=sa -hibernate.connection.password=sa -hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:file:${data.directory}/db/echobase +#hibernate.dialect=org.hibernate.dialect.H2Dialect +#hibernate.connection.username=sa +#hibernate.connection.password=sa +#hibernate.connection.driver_class=org.h2.Driver +#hibernate.connection.url=jdbc:h2:file:${data.directory}/db/echobase Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java 2012-04-04 11:06:54 UTC (rev 487) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java 2012-04-04 14:04:32 UTC (rev 488) @@ -26,9 +26,11 @@ import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.Transaction; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.web.filter.TopiaTransactionFilter; import javax.servlet.ServletRequest; @@ -71,6 +73,10 @@ * @since 1.9.1 */ protected void onCloseTransaction(TopiaContext transaction) { + closeConnection(transaction); + } + + public static void closeConnection(TopiaContext transaction) { if (transaction == null) { if (log.isTraceEnabled()) { log.trace("no transaction to close"); @@ -85,6 +91,13 @@ } try { + Transaction tx = ((TopiaContextImplementor) transaction).getHibernate().getTransaction(); + if (!tx.wasCommitted() && !tx.wasRolledBack()) { + if (log.isDebugEnabled()) { + log.debug("rollback transaction!"); + } + tx.rollback(); + } transaction.closeContext(); } catch (TopiaException e) { throw new TopiaRuntimeException(e); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java 2012-04-04 11:06:54 UTC (rev 487) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java 2012-04-04 14:04:32 UTC (rev 488) @@ -26,6 +26,7 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.Preparable; import fr.ifremer.echobase.services.AbstractEchobaseActionConfiguration; +import fr.ifremer.echobase.ui.EchoBaseTopiaTransactionFilter; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -96,7 +97,7 @@ } finally { try { - topiaContext.closeContext(); + EchoBaseTopiaTransactionFilter.closeConnection(topiaContext); } finally { closeAction(model); } Modified: trunk/echobase-ui/src/main/resources/echobase.properties =================================================================== --- trunk/echobase-ui/src/main/resources/echobase.properties 2012-04-04 11:06:54 UTC (rev 487) +++ trunk/echobase-ui/src/main/resources/echobase.properties 2012-04-04 14:04:32 UTC (rev 488) @@ -28,8 +28,7 @@ hibernate.hbm2ddl.auto=none hibernate.show_sql=false hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.provider_class=fr.ifremer.echobase.EchoBaseTopiaConnectionProvider -#hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider +hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider hibernate.connection.driver_class=org.h2.Driver hibernate.connection.url=jdbc:h2:file:${data.directory}/db/echobase

1 0

r487 - in trunk: . echobase-entities echobase-services echobase-tools echobase-ui
by tchemit＠users.forge.codelutin.com 04 Apr '12

04 Apr '12

Author: tchemit Date: 2012-04-04 13:06:54 +0200 (Wed, 04 Apr 2012) New Revision: 487 Url: http://forge.codelutin.com/repositories/revision/echobase/487 Log: create version 0.6 Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-04-04 11:05:41 UTC (rev 486) +++ trunk/echobase-entities/pom.xml 2012-04-04 11:06:54 UTC (rev 487) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-04-04 11:05:41 UTC (rev 486) +++ trunk/echobase-services/pom.xml 2012-04-04 11:06:54 UTC (rev 487) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-04-04 11:05:41 UTC (rev 486) +++ trunk/echobase-tools/pom.xml 2012-04-04 11:06:54 UTC (rev 487) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-04-04 11:05:41 UTC (rev 486) +++ trunk/echobase-ui/pom.xml 2012-04-04 11:06:54 UTC (rev 487) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-04 11:05:41 UTC (rev 486) +++ trunk/pom.xml 2012-04-04 11:06:54 UTC (rev 487) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>1.0-SNAPSHOT</version> + <version>0.6-SNAPSHOT</version> <modules> <module>echobase-entities</module>

1 0

r486 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase echobase-entities/src/main/resources echobase-ui/src/main/java/fr/ifremer/echobase/ui echobase-ui/src/main/resources
by tchemit＠users.forge.codelutin.com 04 Apr '12

04 Apr '12

Author: tchemit Date: 2012-04-04 13:05:41 +0200 (Wed, 04 Apr 2012) New Revision: 486 Url: http://forge.codelutin.com/repositories/revision/echobase/486 Log: fixes #1084: Apr?\195?\168s un import en erreur, impossible d'en recommencer un Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java Modified: trunk/echobase-entities/src/main/resources/topia-h2.properties trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java trunk/echobase-ui/src/main/resources/echobase.properties Added: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java (rev 0) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java 2012-04-04 11:05:41 UTC (rev 486) @@ -0,0 +1,87 @@ +/* + * #%L + * EchoBase :: Entities + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.framework.TopiaConnectionProvider; + +import java.sql.Connection; +import java.sql.SQLException; + +/** + * To fix roolback errors. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.6 + */ +public class EchoBaseTopiaConnectionProvider extends TopiaConnectionProvider { + + /** Logger. */ + private static final Log log = LogFactory.getLog(EchoBaseTopiaConnectionProvider.class); + + @Override + public void closeConnection(Connection conn) throws SQLException { + + // if connection is already closed, nothing has to be done + // we can't keep this connection (and can not be push in pool) + + if (conn.isClosed()) { + + if (log.isDebugEnabled()) { + log.debug("Connection [" + conn + + "] alreay closed!, will not use it any longer "); + } + return; + } + + + // connection was not closed, can push it in the pool (if pool is not + // full) + + synchronized (getPool()) { + int currentSize = getPool().size(); + if (currentSize < getPoolSize()) { + if (log.isTraceEnabled()) { + log.trace("returning connection to pool, pool size: " + + (currentSize + 1)); + } + + // make sure connection is always rollback before keep it + conn.rollback(); + + getPool().add(conn); + return; + } + } + + // pool was full, must release the connection which will be loose + + if (log.isDebugEnabled()) { + log.debug("closing JDBC connection"); + } + + conn.close(); + } +} Property changes on: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaConnectionProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-entities/src/main/resources/topia-h2.properties =================================================================== --- trunk/echobase-entities/src/main/resources/topia-h2.properties 2012-04-03 15:04:16 UTC (rev 485) +++ trunk/echobase-entities/src/main/resources/topia-h2.properties 2012-04-04 11:05:41 UTC (rev 486) @@ -28,4 +28,5 @@ hibernate.connection.driver_class=org.h2.Driver hibernate.connection.username=sa hibernate.connection.password=sa -hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider +hibernate.connection.provider_class=fr.ifremer.echobase.EchoBaseTopiaConnectionProvider +#hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java 2012-04-03 15:04:16 UTC (rev 485) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java 2012-04-04 11:05:41 UTC (rev 486) @@ -61,4 +61,34 @@ throw new TopiaRuntimeException("Could not start transaction", eee); } } + + /** + * Hook method to close the topia transaction of the request at the end of + * the request when all filter has been consumed. + * + * @param transaction the transaction to close (can be null if transaction + * was not required while the current request) + * @since 1.9.1 + */ + protected void onCloseTransaction(TopiaContext transaction) { + if (transaction == null) { + if (log.isTraceEnabled()) { + log.trace("no transaction to close"); + } + } else if (transaction.isClosed()) { + if (log.isTraceEnabled()) { + log.trace("transaction " + transaction + " is already closed"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("closing transaction " + transaction); + } + + try { + transaction.closeContext(); + } catch (TopiaException e) { + throw new TopiaRuntimeException(e); + } + } + } } Modified: trunk/echobase-ui/src/main/resources/echobase.properties =================================================================== --- trunk/echobase-ui/src/main/resources/echobase.properties 2012-04-03 15:04:16 UTC (rev 485) +++ trunk/echobase-ui/src/main/resources/echobase.properties 2012-04-04 11:05:41 UTC (rev 486) @@ -28,7 +28,8 @@ hibernate.hbm2ddl.auto=none hibernate.show_sql=false hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider +hibernate.connection.provider_class=fr.ifremer.echobase.EchoBaseTopiaConnectionProvider +#hibernate.connection.provider_class=org.nuiton.topia.framework.TopiaConnectionProvider hibernate.connection.driver_class=org.h2.Driver hibernate.connection.url=jdbc:h2:file:${data.directory}/db/echobase

1 0