July 2013 - Echobase-commits - mailman.cloud.codelutin.com

r824 - in trunk: . echobase-domain/src/main/java/fr/ifremer/echobase echobase-domain/src/main/java/fr/ifremer/echobase/csv echobase-domain/src/main/resources/META-INF/services echobase-services echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery echobase-services/src/main/java/fr/ifremer/echobase/services/importdata echobase-services/src/m
by tchemit＠users.forge.codelutin.com July 25, 2013

July 25, 2013

Author: tchemit Date: 2013-07-25 19:08:39 +0200 (Thu, 25 Jul 2013) New Revision: 824 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/824 Log: refs #2870: Mise ?\195?\160 jour des librairies Added: trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider Removed: trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseApplicationConfigProvider.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java trunk/echobase-services/pom.xml trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryCsvModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonAllImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DecoratorServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/EchoBaseDbCreator.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java trunk/pom.xml Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseApplicationConfigProvider.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseApplicationConfigProvider.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseApplicationConfigProvider.java 2013-07-25 17:08:39 UTC (rev 824) @@ -23,9 +23,9 @@ * #L% */ -import org.nuiton.util.config.ApplicationConfigProvider; -import org.nuiton.util.config.ConfigActionDef; -import org.nuiton.util.config.ConfigOptionDef; +import org.nuiton.config.ApplicationConfigProvider; +import org.nuiton.config.ConfigActionDef; +import org.nuiton.config.ConfigOptionDef; import java.util.Locale; Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2013-07-25 17:08:39 UTC (rev 824) @@ -27,8 +27,8 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.config.ApplicationConfig; -import org.nuiton.util.config.ArgumentsParserException; +import org.nuiton.config.ApplicationConfig; +import org.nuiton.config.ArgumentsParserException; import org.nuiton.util.FileUtil; import org.nuiton.util.Version; Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2013-07-25 17:08:39 UTC (rev 824) @@ -23,7 +23,7 @@ package fr.ifremer.echobase; import org.nuiton.util.Version; -import org.nuiton.util.config.ConfigOptionDef; +import org.nuiton.config.ConfigOptionDef; import java.io.File; import java.net.URL; Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/CellValueParser.java 2013-07-25 17:08:39 UTC (rev 824) @@ -28,8 +28,8 @@ import fr.ifremer.echobase.entities.data.Voyage; import org.apache.commons.collections.CollectionUtils; import org.nuiton.topia.TopiaException; -import org.nuiton.util.csv.ImportRuntimeException; -import org.nuiton.util.csv.ValueParser; +import org.nuiton.csv.ImportRuntimeException; +import org.nuiton.csv.ValueParser; import java.text.ParseException; import java.util.List; Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ChainValueParser.java 2013-07-25 17:08:39 UTC (rev 824) @@ -26,7 +26,7 @@ import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.csv.ValueParser; +import org.nuiton.csv.ValueParser; import java.text.ParseException; import java.util.Iterator; Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java 2013-07-25 17:08:39 UTC (rev 824) @@ -29,8 +29,8 @@ import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.DataQuality; import org.nuiton.topia.persistence.csv.TopiaCsvCommons; -import org.nuiton.util.csv.ValueParser; -import org.nuiton.util.csv.ValueSetter; +import org.nuiton.csv.ValueParser; +import org.nuiton.csv.ValueSetter; import java.util.Date; import java.util.List; Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java 2013-07-25 17:08:39 UTC (rev 824) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.data.Result; import fr.ifremer.echobase.entities.data.ResultImpl; import fr.ifremer.echobase.entities.references.DataMetadata; -import org.nuiton.util.csv.ValueParser; +import org.nuiton.csv.ValueParser; import java.text.ParseException; Copied: trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider (from rev 823, trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider) =================================================================== --- trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider (rev 0) +++ trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider 2013-07-25 17:08:39 UTC (rev 824) @@ -0,0 +1 @@ +fr.ifremer.echobase.EchoBaseApplicationConfigProvider \ No newline at end of file Deleted: trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider =================================================================== --- trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider 2013-07-25 17:08:39 UTC (rev 824) @@ -1 +0,0 @@ -fr.ifremer.echobase.EchoBaseApplicationConfigProvider \ No newline at end of file Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/pom.xml 2013-07-25 17:08:39 UTC (rev 824) @@ -111,6 +111,11 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -50,12 +50,12 @@ import org.nuiton.util.PagerBeanUtil; import org.nuiton.util.beans.BeanMonitor; import org.nuiton.util.beans.PropertyDiff; -import org.nuiton.util.csv.ExportModel; -import org.nuiton.util.csv.ExportableColumn; -import org.nuiton.util.csv.ImportExportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.csv.ExportModel; +import org.nuiton.csv.ExportableColumn; +import org.nuiton.csv.ImportExportModel; +import org.nuiton.csv.ImportableColumn; +import org.nuiton.decorator.Decorator; +import org.nuiton.decorator.JXPathDecorator; import java.util.Collection; import java.util.Date; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -87,10 +87,10 @@ import fr.ifremer.echobase.entities.references.VesselType; import org.apache.commons.collections.CollectionUtils; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.decorator.Decorator; -import org.nuiton.util.decorator.DecoratorMulti18nProvider; -import org.nuiton.util.decorator.DecoratorUtil; -import org.nuiton.util.decorator.JXPathDecorator; +import org.nuiton.decorator.Decorator; +import org.nuiton.decorator.DecoratorMulti18nProvider; +import org.nuiton.decorator.DecoratorUtil; +import org.nuiton.decorator.JXPathDecorator; import java.util.Collection; import java.util.List; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -38,8 +38,8 @@ import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.ColumnMeta; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.csv.ExportModel; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.csv.ExportModel; +import org.nuiton.decorator.Decorator; import java.io.File; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryCsvModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryCsvModel.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryCsvModel.java 2013-07-25 17:08:39 UTC (rev 824) @@ -24,7 +24,7 @@ */ import fr.ifremer.echobase.csv.EchoBaseCsvUtil; -import org.nuiton.util.csv.ext.AbstractExportModel; +import org.nuiton.csv.ext.AbstractExportModel; import java.util.Map; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -34,7 +34,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.pager.TopiaPagerBean; import org.nuiton.util.RecursiveProperties; -import org.nuiton.util.csv.Export; +import org.nuiton.csv.Export; import java.util.List; import java.util.Map; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -58,7 +58,7 @@ import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.TimeLog; -import org.nuiton.util.csv.ImportRuntimeException; +import org.nuiton.csv.ImportRuntimeException; import java.io.BufferedReader; import java.io.FileInputStream; 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 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -53,8 +53,8 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportRuntimeException; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportRuntimeException; import java.io.Reader; import java.text.DateFormat; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -55,8 +55,8 @@ import fr.ifremer.echobase.services.importdata.csv.TotalSampleImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportRuntimeException; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportRuntimeException; import java.io.Reader; import java.util.Collection; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonAllImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonAllImportService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonAllImportService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -40,9 +40,9 @@ import fr.ifremer.echobase.services.importdata.csv.VoyageImportModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportRuntimeException; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportModel; +import org.nuiton.csv.ImportRuntimeException; import java.io.Reader; import java.util.Arrays; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CommonImportService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -43,8 +43,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportRuntimeException; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportRuntimeException; import java.io.Reader; import java.util.Arrays; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -50,8 +50,8 @@ import fr.ifremer.echobase.services.importdata.csv.OperationMetadataValueImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportRuntimeException; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportRuntimeException; import java.io.Reader; import java.util.Collection; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -55,9 +55,9 @@ import fr.ifremer.echobase.services.importdata.csv.EsduResultBySpeciesAndSizeCategoryImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportRuntimeException; -import org.nuiton.util.csv.ext.CsvReaders; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportRuntimeException; +import org.nuiton.csv.ext.CsvReaders; import java.io.Reader; import java.util.Arrays; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsImportService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -33,7 +33,7 @@ import fr.ifremer.echobase.entities.data.Transit; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.DecoratorService; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; import java.util.Map; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -50,9 +50,9 @@ import fr.ifremer.echobase.services.importdata.csv.MapCellImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportRuntimeException; -import org.nuiton.util.csv.ext.CsvReaders; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportRuntimeException; +import org.nuiton.csv.ext.CsvReaders; import java.io.Reader; import java.util.Arrays; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -54,9 +54,9 @@ import fr.ifremer.echobase.services.importdata.csv.RegionCellResultImportRow; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportRuntimeException; -import org.nuiton.util.csv.ext.CsvReaders; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportRuntimeException; +import org.nuiton.csv.ext.CsvReaders; import java.io.Reader; import java.util.Arrays; 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 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -51,8 +51,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportRuntimeException; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportRuntimeException; import java.io.Reader; import java.util.Arrays; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java 2013-07-25 17:08:39 UTC (rev 824) @@ -33,7 +33,7 @@ import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.ColumnMeta; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.csv.ImportModel; +import org.nuiton.csv.ImportModel; import java.util.Collection; import java.util.Map; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/ImportService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -36,8 +36,8 @@ import org.nuiton.topia.persistence.csv.in.CsvImportResult; import org.nuiton.topia.persistence.csv.in.ImportModelFactory; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportModel; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportModel; import java.io.BufferedReader; import java.io.File; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java 2013-07-25 17:08:39 UTC (rev 824) @@ -38,8 +38,8 @@ import org.nuiton.topia.persistence.csv.in.TopiaCsvImports; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportToMap; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportToMap; import java.util.Map; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/FreeImportDbStrategy.java 2013-07-25 17:08:39 UTC (rev 824) @@ -36,7 +36,7 @@ import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; import java.io.File; import java.util.Date; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java 2013-07-25 17:08:39 UTC (rev 824) @@ -54,7 +54,7 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaIdFactory; import org.nuiton.util.TimeLog; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; import java.util.Comparator; import java.util.List; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DecoratorServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DecoratorServiceTest.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DecoratorServiceTest.java 2013-07-25 17:08:39 UTC (rev 824) @@ -26,7 +26,7 @@ import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import org.junit.Assert; import org.junit.Test; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; import java.util.List; import java.util.Locale; 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 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/importdata/AbstractImportDataServiceIT.java 2013-07-25 17:08:39 UTC (rev 824) @@ -58,8 +58,8 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.csv.in.AbstractImportModel; import org.nuiton.util.TimeLog; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ext.CsvReaders; +import org.nuiton.csv.Import; +import org.nuiton.csv.ext.CsvReaders; import java.io.File; import java.io.Reader; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/EchoBaseDbCreator.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/EchoBaseDbCreator.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/EchoBaseDbCreator.java 2013-07-25 17:08:39 UTC (rev 824) @@ -39,9 +39,9 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; -import org.nuiton.util.csv.Export; -import org.nuiton.util.csv.ValueFormatter; -import org.nuiton.util.csv.ext.AbstractExportModel; +import org.nuiton.csv.Export; +import org.nuiton.csv.ValueFormatter; +import org.nuiton.csv.ext.AbstractExportModel; import java.io.File; import java.io.FileFilter; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2013-07-25 17:08:39 UTC (rev 824) @@ -53,9 +53,9 @@ import org.nuiton.topia.persistence.metadata.MetaFilenameAware; import org.nuiton.topia.persistence.metadata.TableMeta; import org.nuiton.util.FileUtil; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportToMap; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportModel; +import org.nuiton.csv.ImportToMap; import java.io.BufferedReader; import java.io.File; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearLoader.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearLoader.java 2013-07-25 17:08:39 UTC (rev 824) @@ -29,8 +29,8 @@ import fr.ifremer.echobase.entities.references.Gear; import fr.ifremer.echobase.tools.FileType; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.csv.Common; -import org.nuiton.util.csv.ValueParser; +import org.nuiton.csv.Common; +import org.nuiton.csv.ValueParser; import java.util.Date; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java 2013-07-25 17:08:39 UTC (rev 824) @@ -48,8 +48,8 @@ import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportModel; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportModel; import java.io.BufferedReader; import java.io.File; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/GetEntities.java 2013-07-25 17:08:39 UTC (rev 824) @@ -41,7 +41,7 @@ import org.nuiton.topia.persistence.pager.FilterRule; import org.nuiton.topia.persistence.pager.FilterRuleGroupOperator; import org.nuiton.topia.persistence.pager.FilterRuleOperator; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; import java.util.Arrays; import java.util.Collection; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/GetVesselsForVoyage.java 2013-07-25 17:08:39 UTC (rev 824) @@ -31,7 +31,7 @@ import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.lang3.StringUtils; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; import java.util.Map; import java.util.Set; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/removeData/ConfirmDelete.java 2013-07-25 17:08:39 UTC (rev 824) @@ -34,7 +34,7 @@ import fr.ifremer.echobase.ui.actions.AbstractConfigureAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.decorator.Decorator; +import org.nuiton.decorator.Decorator; import java.io.IOException; import java.util.List; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-15 13:07:35 UTC (rev 823) +++ trunk/pom.xml 2013-07-25 17:08:39 UTC (rev 824) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.13-SNAPSHOT</version> + <version>3.4.13</version> </parent> <groupId>fr.ifremer</groupId> @@ -131,20 +131,20 @@  - <eugenePluginVersion>2.6.4-SNAPSHOT</eugenePluginVersion> - <topiaVersion>3.0-SNAPSHOT</topiaVersion> - <nuitonUtilsVersion>2.6.13-SNAPSHOT</nuitonUtilsVersion> + <eugenePluginVersion>2.7</eugenePluginVersion> + <topiaVersion>3.0-alpha-2-SNAPSHOT</topiaVersion> + <nuitonUtilsVersion>2.7</nuitonUtilsVersion> <nuitonI18nVersion>2.5.1</nuitonI18nVersion> <nuitonWebVersion>1.14</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - <struts2Version>2.3.15</struts2Version> + <struts2Version>2.3.15.1</struts2Version> <jqueryPluginVersion>3.6.0</jqueryPluginVersion> <h2Version>1.3.172</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <slf4jVersion>1.7.5</slf4jVersion> <jackcessVersion>1.2.13</jackcessVersion> - <hibernateVersion>4.2.1.Final</hibernateVersion> + <hibernateVersion>4.2.3.Final</hibernateVersion> <googleSearchEnabled>true</googleSearchEnabled> @@ -193,20 +193,26 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>3.0-alpha-1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + <version>3.0-alpha-1</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>3.0-alpha-1</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>3.0-alpha-1</version> </dependency> <dependency> @@ -500,8 +506,8 @@ <plugin> <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils-maven-report-plugin</artifactId> - <version>${nuitonUtilsVersion}</version> + <artifactId>nuiton-maven-report-plugin</artifactId> + <version>3.0-alpha-1</version> <reportSets> <reportSet> <reports>

1 0

r823 - in trunk/src/site: en/rst rst
by tchemit＠users.forge.codelutin.com July 15, 2013

July 15, 2013

Author: tchemit Date: 2013-07-15 15:07:35 +0200 (Mon, 15 Jul 2013) New Revision: 823 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/823 Log: fixes #2250: Param?\195?\168tres manquants dans la doc d'import de donn?\195?\169es Modified: trunk/src/site/en/rst/importData.rst trunk/src/site/rst/importData.rst Modified: trunk/src/site/en/rst/importData.rst =================================================================== --- trunk/src/site/en/rst/importData.rst 2013-07-15 08:32:35 UTC (rev 822) +++ trunk/src/site/en/rst/importData.rst 2013-07-15 13:07:35 UTC (rev 823) @@ -29,26 +29,39 @@ Abstract ======== + Ce document donne la définition de tous les imports de données. -*TODO Translate me* - Format des colonnes ~~~~~~~~~~~~~~~~~~~ -- FK(XXX#yyy) désigne une clef étrangère requise (XXX sur la propriété yyy). -- (int) un entier (pas du nullité 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) -- (date) unique format de date : *yyyy-MM-dd HH:mm:ss.SSSS* -- (esdu cell) nom de cellule esdu - elementary : esduName[_elementaryCellName] - avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS ++---------------+--------------------------------------------------------------+ +| Notation | Type | ++===============+==============================================================+ +| text |une chaine de caractères | ++---------------+--------------------------------------------------------------+ +| FK(XXX#yyy) |désigne une clef étrangère requise (XXX sur la propriété yyy).| ++---------------+--------------------------------------------------------------+ +| (int) |un entier (pas du nullité 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) | ++---------------+--------------------------------------------------------------+ +| (date) |unique format de date : *yyyy-MM-dd HH:mm:ss.SSSS* | ++---------------+--------------------------------------------------------------+ +| (esdu cell) |nom de cellule esdu elementary : esduName[_elementaryCellName]| +| | avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS | ++---------------+--------------------------------------------------------------+ -Note importantes -~~~~~~~~~~~~~~~~ +Notes importantes +~~~~~~~~~~~~~~~~~ - Le nom des colonnes est sensible à la casse, il faut donc bien respecter les noms donnés dans cette page. @@ -73,11 +86,19 @@ Format des colonnes ------------------- -- name -- startDate (date) -- endDate (date) -- startPort -- endPort ++------------+------+ +| Colonne | Type | ++============+======+ +| name |text | ++------------+------+ +| startDate |(date)| ++------------+------+ +| endDate |(date)| ++------------+------+ +| startPort |text | ++------------+------+ +| endPort |text | ++------------+------+ Exemple ------- @@ -100,12 +121,21 @@ Format des colonnes ------------------- -- voyage FK(voyage#name) -- description -- startTime (date) -- endTime (date) -- startLocality -- endLocality ++----------------+---------------+ +| Colonne | Type | ++================+===============+ +| voyage |FK(voyage#name)| ++----------------+---------------+ +| description |text | ++----------------+---------------+ +| startTime |(date) | ++----------------+---------------+ +| endTime |(date) | ++----------------+---------------+ +| startLocality |text | ++----------------+---------------+ +| endLocality |text | ++----------------+---------------+ Exemple ------- @@ -128,22 +158,41 @@ Format des colonnes ------------------- -- voyage FK(voyage#name) -- vesselName FK(Vessel#name) -- title -- transectAbstract -- stratum -- comment -- dateCreated (date) -- timeCoverageStart (date) -- timeCoverageEnd (date) -- geospatialLonMin (float) -- geospatialLonMax (float) -- geospatialLatMin (float) -- geospatialLatMax (float) -- geospatialVerticalMin (float) -- geospatialVerticalMax (float) -- linestring ++------------------------+---------------+ +| Colonne | Type | ++========================+===============+ +| voyage |FK(voyage#name)| ++------------------------+---------------+ +| vesselName |FK(Vessel#name)| ++------------------------+---------------+ +| title |text | ++------------------------+---------------+ +| transectAbstract |text | ++------------------------+---------------+ +| stratum |text | ++------------------------+---------------+ +| comment |text | ++------------------------+---------------+ +| dateCreated |(date) | ++------------------------+---------------+ +| timeCoverageStart |(date) | ++------------------------+---------------+ +| timeCoverageEnd |(date) | ++------------------------+---------------+ +| geospatialLonMin |(float) | ++------------------------+---------------+ +| geospatialLonMax |(float) | ++------------------------+---------------+ +| geospatialLatMin |(float) | ++------------------------+---------------+ +| geospatialLatMax |(float) | ++------------------------+---------------+ +| geospatialVerticalMin |(float) | ++------------------------+---------------+ +| geospatialVerticalMax |(float) | ++------------------------+---------------+ +| linestring |text | ++------------------------+---------------+ Exemple ------- @@ -169,18 +218,33 @@ Format des colonnes ------------------- -- vesselName FK(Vessel#name) -- gearCode FK(Gear#casinoGearName) -- depthStratumId FK(DepthStratum#id) -- operationId -- midHaulLatitude (float) -- midHaulLongitude (float) -- gearShootingStartTime (date) -- gearShootingEndTime (date) -- gearShootingStartLatitude (float) -- gearShootingEndLatitude (float) -- gearShootingStartLongitude (float) -- gearShootingEndLongitude (float) ++-----------------------------+-----------------------+ +| Colonne | Type | ++=============================+=======================+ +| vesselName |FK(Vessel#name) | ++-----------------------------+-----------------------+ +| gearCode |FK(Gear#casinoGearName)| ++-----------------------------+-----------------------+ +| depthStratumId |FK(DepthStratum#id) | ++-----------------------------+-----------------------+ +| operationId |text | ++-----------------------------+-----------------------+ +| midHaulLatitude |(float) | ++-----------------------------+-----------------------+ +| midHaulLongitude |(float) | ++-----------------------------+-----------------------+ +| gearShootingStartTime |(date) | ++-----------------------------+-----------------------+ +| gearShootingEndTime |(date) | ++-----------------------------+-----------------------+ +| gearShootingStartLatitude |(float) | ++-----------------------------+-----------------------+ +| gearShootingEndLatitude |(float) | ++-----------------------------+-----------------------+ +| gearShootingStartLongitude |(float) | ++-----------------------------+-----------------------+ +| gearShootingEndLongitude |(float) | ++-----------------------------+-----------------------+ Exemple ------- @@ -203,10 +267,17 @@ Format des colonnes ------------------- -- vesselName FK(Vessel#name) -- operationId FK(Operation#id) -- metadataType FK(OperationMetadata#name) -- operationMetadataValue ++-------------------------+--------------------------+ +| Colonne | Type | ++=========================+==========================+ +| vesselName |FK(Vessel#name) | ++-------------------------+--------------------------+ +| operationId |FK(Operation#id) | ++-------------------------+--------------------------+ +| metadataType |FK(OperationMetadata#name)| ++-------------------------+--------------------------+ +| operationMetadataValue |text | ++-------------------------+--------------------------+ Exemple ------- @@ -229,11 +300,19 @@ Format des colonnes ------------------- -- vesselName FK(Vessel#name) -- operationId FK(Operation#id) -- metadataType FK(GearMetadata#name) -- gearCode FK(Gear#casinoGearName) -- gearMetadataValue ++---------------------+-----------------------+ +| Colonne | Type | ++=====================+=======================+ +| vesselName |FK(Vessel#name) | ++---------------------+-----------------------+ +| operationId |FK(Operation#id) | ++---------------------+-----------------------+ +| metadataType |FK(GearMetadata#name) | ++---------------------+-----------------------+ +| gearCode |FK(Gear#casinoGearName)| ++---------------------+-----------------------+ +| gearMetadataValue |text | ++---------------------+-----------------------+ Exemple ------- @@ -259,15 +338,27 @@ Format des colonnes ------------------- -- 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) ++-----------------+-------------------------+ +| Colonne | Type | ++=================+=========================+ +| 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) | ++-----------------+-------------------------+ Exemple ------- @@ -290,15 +381,27 @@ Format des colonnes ------------------- -- 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 ++------------------+-------------------------+ +| Colonne | Type | ++==================+=========================+ +| 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 |text | ++------------------+-------------------------+ (colonnes ignorées) subHaul units round @@ -323,12 +426,21 @@ Format des colonnes ------------------- -- operationId FK(Operation#id) -- baracoudaCode FK(Species#baracoudaCode) -- numFish (int) -- name FK(SampleDataType#name) -- dataLabel -- dataValue (Float-NA) ++----------------+--------------------------+ +| Colonne | Type | ++================+==========================+ +| operationId |FK(Operation#id) | ++----------------+--------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------+--------------------------+ +| numFish |(int) | ++----------------+--------------------------+ +| name |FK(SampleDataType#name) | ++----------------+--------------------------+ +| dataLabel |text | ++----------------+--------------------------+ +| dataValue |(Float-NA) | ++----------------+--------------------------+ Exemple ------- @@ -350,9 +462,160 @@ Format des colonnes ------------------- ++---------------------------------------------------------+-----------------------------------------+ +| Colonne | Type | ++=========================================================+=========================================+ +| MOVIES_EILayer |text //A| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset |(colonne ignorée) //B| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\sndname |(colonne ignorée) //C| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\sndident |(colonne ignorée) //D| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\softChannelId |FK(AcousticInstrument#id) //E| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\channelName |(colonne ignorée) //F| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\dataType |(colonne ignorée) //G| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beamType |(colonne ignorée) //H| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\acousticFrequency |(colonne ignorée) //I| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\startSample |(colonne ignorée) //J| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\mainBeamAlongSteeringAngle |(colonne ignorée) //K| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\mainBeamAthwartSteeringAngle |(colonne ignorée) //L| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\absorptionCoef |(Float-NA) //M| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\transmissionPower |(int) //N| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beamAlongAngleSensitivity |(Float) //O| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beamAthwartAngleSensitivity |(Float) //P| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beam3dBWidthAlong |(colonne ignorée) //Q| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beam3dBWidthAthwart |(colonne ignorée) //R| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beamEquTwoWayAngle |(Float) //S| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beamGain |(Float) //T| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beamSACorrection |(Float) //U| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\bottomDetectionMinDepth |(colonne ignorée) //V| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\bottomDetectionMaxDepth |(colonne ignorée) //W| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\bottomDetectionMinLevel |(colonne ignorée) //X| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\AlongTXRXWeightId |(colonne ignorée) //Y| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\AthwartTXRXWeightId |(colonne ignorée) //Z| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\SplitBeamAlongTXRXWeightId |(colonne ignorée) //AA| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\SplitBeamAthwartTXRXWeightId |(colonne ignorée) //AB| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\bandWidth |(colonne ignorée) //AC| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\tvgminrange |(colonne ignorée) //AD| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\tvgmaxrange |(colonne ignorée) //AE| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\pulseduration |(Float) //AF| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav |(colonne ignorée) //AG| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\lat |(colonne ignorée) //AH| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\long |(colonne ignorée) //AI| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\alt |(colonne ignorée) //AJ| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\gndspeed |(colonne ignorée) //AK| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\gndcourse |(colonne ignorée) //AL| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\surfspeed |(colonne ignorée) //AM| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\surfcourse |(colonne ignorée) //AN| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\driftspeed |(colonne ignorée) //AO| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\driftcourse |(colonne ignorée) //AP| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\heading |(colonne ignorée) //AQ| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\roll |(colonne ignorée) //AR| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\pitch |(colonne ignorée) //AS| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\heave |(colonne ignorée) //AT| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\depth |text //AU| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\draught |(colonne ignorée) //AV| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset |(colonne ignorée) //AW| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\cellnum |(int) //AX| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\celltype |(int) //AY| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\depthstart |(float) //AZ| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\depthend |(float) //BA| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\indexstart |(colonne ignorée) //BB| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\indexend |(colonne ignorée) //BC| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\datestart |(date) //BD| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\dateend |(date) //BE| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\lat |(Float) //BF| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\long |(Float) //BG| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\volume |(Integer-NA) //BH| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\area |(int) //BI| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\diststart |(colonne ignorée) //BJ| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\distend |(colonne ignorée) //BK| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\thresholdup |(int) //BL| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\thresholdlow |(int) //BM| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\eilayer |(colonne ignorée) //BN| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\eilayer\\sa |(Float-NA) //BO| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\eilayer\\sv |(colonne ignorée) //BP| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\eilayer\\ni |(Integer-NA) //BQ| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\eilayer\\nt |(Integer-NA) //BR| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\boterr |(colonne ignorée) //BR| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\boterr\\sa |(colonne ignorée) //BT| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\boterr\\ni |(colonne ignorée) //BU| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\soundcelerity |text //BV| ++---------------------------------------------------------+-----------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) //E| ++---------------------------------------------------------+-----------------------------------------+ -A faire... - Exemple ------- @@ -377,11 +640,19 @@ Format des colonnes ------------------- -- echotypeName -- meaning -- voyage FK(Voyage#name) -- depthStratumId FK(DepthStratum#id) -- baracoudaCode FK(Species#baracoudaCode) ++-----------------+-------------------------+ +| Colonne | Type | ++=================+=========================+ +| echotypeName |text | ++-----------------+-------------------------+ +| meaning |text | ++-----------------+-------------------------+ +| voyage |FK(Voyage#name) | ++-----------------+-------------------------+ +| depthStratumId |FK(DepthStratum#id) | ++-----------------+-------------------------+ +| baracoudaCode |FK(Species#baracoudaCode)| ++-----------------+-------------------------+ Exemple ------- @@ -404,12 +675,21 @@ Format des colonnes ------------------- -- aParameter (float) -- bParameter (float) -- voyage FK(Voyage#name) -- sizeCategory FK(SizeCategory#name) -- baracoudaCode FK(Species#baracoudaCode) -- strata FK(Strata#name) ++----------------+-------------------------+ +| Colonne | Type | ++================+=========================+ +| aParameter |(float) | ++----------------+-------------------------+ +| bParameter |(float) | ++----------------+-------------------------+ +| voyage |FK(Voyage#name) | ++----------------+-------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++----------------+-------------------------+ +| baracoudaCode |FK(Species#baracoudaCode)| ++----------------+-------------------------+ +| strata |FK(Strata#name) | ++----------------+-------------------------+ Exemple ------- @@ -432,13 +712,23 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- age (int) -- length (float) -- percentAtAge (float) -- metadata -- strata FK(Strata#name) -- baracoudaCode FK(Species#baracoudaCode) ++----------------+-------------------------+ +| Colonne | Type | ++================+=========================+ +| voyage |FK(Voyage#name) | ++----------------+-------------------------+ +| age |(int) | ++----------------+-------------------------+ +| length |(float) | ++----------------+-------------------------+ +| percentAtAge |(float) | ++----------------+-------------------------+ +| metadata |text | ++----------------+-------------------------+ +| strata |FK(Strata#name) | ++----------------+-------------------------+ +| baracoudaCode |FK(Species#baracoudaCode)| ++----------------+-------------------------+ Exemple ------- @@ -464,11 +754,19 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- name FK(esdu cell) -- echotype FK(Echotype#name) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) ++----------------+-------------------------------------------------------------+ +| Colonne | Type | ++================+=============================================================+ +| voyage |FK(Voyage#name) | ++----------------+-------------------------------------------------------------+ +| name |FK(esdu cell) | ++----------------+-------------------------------------------------------------+ +| echotype |FK(Echotype#name) | ++----------------+-------------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------+-------------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer) | ++----------------+-------------------------------------------------------------+ Exemple ------- @@ -491,13 +789,23 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- name FK(esdu cell) -- echotype FK(Echotype#name) -- sizeCategory FK(SizeCategory#name) -- baracoudaCode FK(Species#baracoudaCode) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) ++----------------+-------------------------------------------------------------+ +| Colonne | Type | ++================+=============================================================+ +| voyage |FK(Voyage#name) | ++----------------+-------------------------------------------------------------+ +| name |FK(esdu cell) | ++----------------+-------------------------------------------------------------+ +| echotype |FK(Echotype#name) | ++----------------+-------------------------------------------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++----------------+-------------------------------------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------+-------------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------+-------------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer) | ++----------------+-------------------------------------------------------------+ Exemple ------- @@ -520,13 +828,23 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- name FK(esdu cell) -- baracoudaCode FK(Species#baracoudaCode) -- ageCategory -- ageCategoryMeaning -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) ++----------------------+-------------------------------------------------------+ +| Colonne | Type | ++======================+=======================================================+ +| voyage |FK(Voyage#name) | ++----------------------+-------------------------------------------------------+ +| name |FK(esdu cell) | ++----------------------+-------------------------------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------------+-------------------------------------------------------+ +| ageCategory |text | ++----------------------+-------------------------------------------------------+ +| ageCategoryMeaning |text | ++----------------------+-------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------------+-------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer)| ++----------------------+-------------------------------------------------------+ Exemple ------- @@ -549,13 +867,23 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- name FK(esdu cell) -- baracoudaCode FK(Species#baracoudaCode) -- sizeCategory -- sizeCategoryMeaning -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) ++----------------------+-------------------------------------------------------+ +| Colonne | Type | ++======================+=======================================================+ +| voyage |FK(Voyage#name) | ++----------------------+-------------------------------------------------------+ +| name |FK(esdu cell) | ++----------------------+-------------------------------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------------+-------------------------------------------------------+ +| sizeCategory |text | ++----------------------+-------------------------------------------------------+ +| sizeCategoryMeaning |text | ++----------------------+-------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------------+-------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer)| ++----------------------+-------------------------------------------------------+ Exemple ------- @@ -581,12 +909,21 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- cellType FK(CellType) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- name -- regionEnvCoordinates -- surface (float) ++-----------------------+------------------------------------------------------+ +| Colonne | Type | ++=======================+======================================================+ +| voyage |FK(Voyage#name) | ++-----------------------+------------------------------------------------------+ +| cellType |FK(CellType) | ++-----------------------+------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++-----------------------+------------------------------------------------------+ +| name |text | ++-----------------------+------------------------------------------------------+ +| regionEnvCoordinates |text | ++-----------------------+------------------------------------------------------+ +| surface |(float) | ++-----------------------+------------------------------------------------------+ Exemple ------- @@ -609,9 +946,15 @@ Format des colonnes ------------------- -- voyage FK(Voyage) -- regionName FK(Cell#name) -- esduName FK(Cell#name) ++-----------------------+------------------------------------------------------+ +| Colonne | Type | ++=======================+======================================================+ +| voyage |FK(Voyage) | ++-----------------------+------------------------------------------------------+ +| regionName |FK(Cell#name) | ++-----------------------+------------------------------------------------------+ +| esduName |FK(Cell#name) | ++-----------------------+------------------------------------------------------+ Exemple ------- @@ -634,13 +977,23 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- name FK(Cell#name) -- baracoudaCode FK(Species#baracoudaCode) -- echotype FK(Echotype#name) -- sizeCategory FK(SizeCategory#name) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) ++----------------------+-------------------------------------------------------+ +| Colonne | Type | ++======================+=======================================================+ +| voyage |FK(Voyage#name) | ++----------------------+-------------------------------------------------------+ +| name |FK(Cell#name) | ++----------------------+-------------------------------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------------+-------------------------------------------------------+ +| echotype |FK(Echotype#name) | ++----------------------+-------------------------------------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++----------------------+-------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------------+-------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer)| ++----------------------+-------------------------------------------------------+ Exemple ------- @@ -666,19 +1019,35 @@ Format des colonnes ------------------- -- 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) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) ++----------------------+-------------------------------------------------------+ +| Colonne | Type | ++======================+=======================================================+ +| voyage |FK(Voyage#name) | ++----------------------+-------------------------------------------------------+ +| name |text | ++----------------------+-------------------------------------------------------+ +| 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) | ++----------------------+-------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer)| ++----------------------+-------------------------------------------------------+ Exemple ------- Modified: trunk/src/site/rst/importData.rst =================================================================== --- trunk/src/site/rst/importData.rst 2013-07-15 08:32:35 UTC (rev 822) +++ trunk/src/site/rst/importData.rst 2013-07-15 13:07:35 UTC (rev 823) @@ -5,7 +5,7 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2011 - 2012 Ifremer, Codelutin +.. * 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 @@ -34,19 +34,33 @@ Format des colonnes ~~~~~~~~~~~~~~~~~~~ -- FK(XXX#yyy) désigne une clef étrangère requise (XXX sur la propriété yyy). -- (int) un entier (pas du nullité 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) -- (date) unique format de date : *yyyy-MM-dd HH:mm:ss.SSSS* -- (esdu cell) nom de cellule esdu - elementary : esduName[_elementaryCellName] - avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS ++---------------+--------------------------------------------------------------+ +| Notation | Type | ++===============+==============================================================+ +| text |une chaine de caractères | ++---------------+--------------------------------------------------------------+ +| FK(XXX#yyy) |désigne une clef étrangère requise (XXX sur la propriété yyy).| ++---------------+--------------------------------------------------------------+ +| (int) |un entier (pas du nullité 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) | ++---------------+--------------------------------------------------------------+ +| (date) |unique format de date : *yyyy-MM-dd HH:mm:ss.SSSS* | ++---------------+--------------------------------------------------------------+ +| (esdu cell) |nom de cellule esdu elementary : esduName[_elementaryCellName]| +| | avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS | ++---------------+--------------------------------------------------------------+ -Note importantes -~~~~~~~~~~~~~~~~ +Notes importantes +~~~~~~~~~~~~~~~~~ - Le nom des colonnes est sensible à la casse, il faut donc bien respecter les noms donnés dans cette page. @@ -71,11 +85,19 @@ Format des colonnes ------------------- -- name -- startDate (date) -- endDate (date) -- startPort -- endPort ++------------+------+ +| Colonne | Type | ++============+======+ +| name |text | ++------------+------+ +| startDate |(date)| ++------------+------+ +| endDate |(date)| ++------------+------+ +| startPort |text | ++------------+------+ +| endPort |text | ++------------+------+ Exemple ------- @@ -98,12 +120,21 @@ Format des colonnes ------------------- -- voyage FK(voyage#name) -- description -- startTime (date) -- endTime (date) -- startLocality -- endLocality ++----------------+---------------+ +| Colonne | Type | ++================+===============+ +| voyage |FK(voyage#name)| ++----------------+---------------+ +| description |text | ++----------------+---------------+ +| startTime |(date) | ++----------------+---------------+ +| endTime |(date) | ++----------------+---------------+ +| startLocality |text | ++----------------+---------------+ +| endLocality |text | ++----------------+---------------+ Exemple ------- @@ -126,22 +157,41 @@ Format des colonnes ------------------- -- voyage FK(voyage#name) -- vesselName FK(Vessel#name) -- title -- transectAbstract -- stratum -- comment -- dateCreated (date) -- timeCoverageStart (date) -- timeCoverageEnd (date) -- geospatialLonMin (float) -- geospatialLonMax (float) -- geospatialLatMin (float) -- geospatialLatMax (float) -- geospatialVerticalMin (float) -- geospatialVerticalMax (float) -- linestring ++------------------------+---------------+ +| Colonne | Type | ++========================+===============+ +| voyage |FK(voyage#name)| ++------------------------+---------------+ +| vesselName |FK(Vessel#name)| ++------------------------+---------------+ +| title |text | ++------------------------+---------------+ +| transectAbstract |text | ++------------------------+---------------+ +| stratum |text | ++------------------------+---------------+ +| comment |text | ++------------------------+---------------+ +| dateCreated |(date) | ++------------------------+---------------+ +| timeCoverageStart |(date) | ++------------------------+---------------+ +| timeCoverageEnd |(date) | ++------------------------+---------------+ +| geospatialLonMin |(float) | ++------------------------+---------------+ +| geospatialLonMax |(float) | ++------------------------+---------------+ +| geospatialLatMin |(float) | ++------------------------+---------------+ +| geospatialLatMax |(float) | ++------------------------+---------------+ +| geospatialVerticalMin |(float) | ++------------------------+---------------+ +| geospatialVerticalMax |(float) | ++------------------------+---------------+ +| linestring |text | ++------------------------+---------------+ Exemple ------- @@ -167,18 +217,33 @@ Format des colonnes ------------------- -- vesselName FK(Vessel#name) -- gearCode FK(Gear#casinoGearName) -- depthStratumId FK(DepthStratum#id) -- operationId -- midHaulLatitude (float) -- midHaulLongitude (float) -- gearShootingStartTime (date) -- gearShootingEndTime (date) -- gearShootingStartLatitude (float) -- gearShootingEndLatitude (float) -- gearShootingStartLongitude (float) -- gearShootingEndLongitude (float) ++-----------------------------+-----------------------+ +| Colonne | Type | ++=============================+=======================+ +| vesselName |FK(Vessel#name) | ++-----------------------------+-----------------------+ +| gearCode |FK(Gear#casinoGearName)| ++-----------------------------+-----------------------+ +| depthStratumId |FK(DepthStratum#id) | ++-----------------------------+-----------------------+ +| operationId |text | ++-----------------------------+-----------------------+ +| midHaulLatitude |(float) | ++-----------------------------+-----------------------+ +| midHaulLongitude |(float) | ++-----------------------------+-----------------------+ +| gearShootingStartTime |(date) | ++-----------------------------+-----------------------+ +| gearShootingEndTime |(date) | ++-----------------------------+-----------------------+ +| gearShootingStartLatitude |(float) | ++-----------------------------+-----------------------+ +| gearShootingEndLatitude |(float) | ++-----------------------------+-----------------------+ +| gearShootingStartLongitude |(float) | ++-----------------------------+-----------------------+ +| gearShootingEndLongitude |(float) | ++-----------------------------+-----------------------+ Exemple ------- @@ -201,10 +266,17 @@ Format des colonnes ------------------- -- vesselName FK(Vessel#name) -- operationId FK(Operation#id) -- metadataType FK(OperationMetadata#name) -- operationMetadataValue ++-------------------------+--------------------------+ +| Colonne | Type | ++=========================+==========================+ +| vesselName |FK(Vessel#name) | ++-------------------------+--------------------------+ +| operationId |FK(Operation#id) | ++-------------------------+--------------------------+ +| metadataType |FK(OperationMetadata#name)| ++-------------------------+--------------------------+ +| operationMetadataValue |text | ++-------------------------+--------------------------+ Exemple ------- @@ -227,11 +299,19 @@ Format des colonnes ------------------- -- vesselName FK(Vessel#name) -- operationId FK(Operation#id) -- metadataType FK(GearMetadata#name) -- gearCode FK(Gear#casinoGearName) -- gearMetadataValue ++---------------------+-----------------------+ +| Colonne | Type | ++=====================+=======================+ +| vesselName |FK(Vessel#name) | ++---------------------+-----------------------+ +| operationId |FK(Operation#id) | ++---------------------+-----------------------+ +| metadataType |FK(GearMetadata#name) | ++---------------------+-----------------------+ +| gearCode |FK(Gear#casinoGearName)| ++---------------------+-----------------------+ +| gearMetadataValue |text | ++---------------------+-----------------------+ Exemple ------- @@ -257,15 +337,27 @@ Format des colonnes ------------------- -- 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) ++-----------------+-------------------------+ +| Colonne | Type | ++=================+=========================+ +| 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) | ++-----------------+-------------------------+ Exemple ------- @@ -288,15 +380,27 @@ Format des colonnes ------------------- -- 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 ++------------------+-------------------------+ +| Colonne | Type | ++==================+=========================+ +| 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 |text | ++------------------+-------------------------+ (colonnes ignorées) subHaul units round @@ -321,12 +425,21 @@ Format des colonnes ------------------- -- operationId FK(Operation#id) -- baracoudaCode FK(Species#baracoudaCode) -- numFish (int) -- name FK(SampleDataType#name) -- dataLabel -- dataValue (Float-NA) ++----------------+--------------------------+ +| Colonne | Type | ++================+==========================+ +| operationId |FK(Operation#id) | ++----------------+--------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------+--------------------------+ +| numFish |(int) | ++----------------+--------------------------+ +| name |FK(SampleDataType#name) | ++----------------+--------------------------+ +| dataLabel |text | ++----------------+--------------------------+ +| dataValue |(Float-NA) | ++----------------+--------------------------+ Exemple ------- @@ -348,83 +461,160 @@ Format des colonnes ------------------- ++---------------------------------------------------------+-----------------------------------------+ +| Colonne | Type | ++=========================================================+=========================================+ +| MOVIES_EILayer |text //A| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset |(colonne ignorée) //B| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\sndname |(colonne ignorée) //C| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\sndident |(colonne ignorée) //D| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\softChannelId |FK(AcousticInstrument#id) //E| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\channelName |(colonne ignorée) //F| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\dataType |(colonne ignorée) //G| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beamType |(colonne ignorée) //H| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\acousticFrequency |(colonne ignorée) //I| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\startSample |(colonne ignorée) //J| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\mainBeamAlongSteeringAngle |(colonne ignorée) //K| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\mainBeamAthwartSteeringAngle |(colonne ignorée) //L| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\absorptionCoef |(Float-NA) //M| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\transmissionPower |(int) //N| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beamAlongAngleSensitivity |(Float) //O| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beamAthwartAngleSensitivity |(Float) //P| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beam3dBWidthAlong |(colonne ignorée) //Q| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beam3dBWidthAthwart |(colonne ignorée) //R| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beamEquTwoWayAngle |(Float) //S| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beamGain |(Float) //T| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\beamSACorrection |(Float) //U| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\bottomDetectionMinDepth |(colonne ignorée) //V| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\bottomDetectionMaxDepth |(colonne ignorée) //W| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\bottomDetectionMinLevel |(colonne ignorée) //X| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\AlongTXRXWeightId |(colonne ignorée) //Y| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\AthwartTXRXWeightId |(colonne ignorée) //Z| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\SplitBeamAlongTXRXWeightId |(colonne ignorée) //AA| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\SplitBeamAthwartTXRXWeightId |(colonne ignorée) //AB| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\bandWidth |(colonne ignorée) //AC| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\tvgminrange |(colonne ignorée) //AD| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\tvgmaxrange |(colonne ignorée) //AE| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\pulseduration |(Float) //AF| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav |(colonne ignorée) //AG| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\lat |(colonne ignorée) //AH| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\long |(colonne ignorée) //AI| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\alt |(colonne ignorée) //AJ| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\gndspeed |(colonne ignorée) //AK| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\gndcourse |(colonne ignorée) //AL| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\surfspeed |(colonne ignorée) //AM| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\surfcourse |(colonne ignorée) //AN| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\driftspeed |(colonne ignorée) //AO| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\driftcourse |(colonne ignorée) //AP| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\heading |(colonne ignorée) //AQ| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\roll |(colonne ignorée) //AR| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\pitch |(colonne ignorée) //AS| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\heave |(colonne ignorée) //AT| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\depth |text //AU| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\shipnav\\draught |(colonne ignorée) //AV| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset |(colonne ignorée) //AW| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\cellnum |(int) //AX| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\celltype |(int) //AY| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\depthstart |(float) //AZ| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\depthend |(float) //BA| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\indexstart |(colonne ignorée) //BB| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\indexend |(colonne ignorée) //BC| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\datestart |(date) //BD| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\dateend |(date) //BE| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\lat |(Float) //BF| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\long |(Float) //BG| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\volume |(Integer-NA) //BH| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\area |(int) //BI| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\diststart |(colonne ignorée) //BJ| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\distend |(colonne ignorée) //BK| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\thresholdup |(int) //BL| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\cellset\\thresholdlow |(int) //BM| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\eilayer |(colonne ignorée) //BN| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\eilayer\\sa |(Float-NA) //BO| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\eilayer\\sv |(colonne ignorée) //BP| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\eilayer\\ni |(Integer-NA) //BQ| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\eilayer\\nt |(Integer-NA) //BR| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\boterr |(colonne ignorée) //BR| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\boterr\\sa |(colonne ignorée) //BT| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\boterr\\ni |(colonne ignorée) //BU| ++---------------------------------------------------------+-----------------------------------------+ +| MOVIES_EILayer\\sndset\\soundcelerity |text //BV| ++---------------------------------------------------------+-----------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) //E| ++---------------------------------------------------------+-----------------------------------------+ -- *MOVIES_EILayer* //A -- *MOVIES_EILayer\\sndset* (colonne ignorée) //B -- *MOVIES_EILayer\\sndset\\sndname* (colonne ignorée) //C -- *MOVIES_EILayer\\sndset\\sndident* (colonne ignorée) //D -- *MOVIES_EILayer\\sndset\\softChannelId* FK(AcousticInstrument#id) //E -- *MOVIES_EILayer\\sndset\\channelName* (colonne ignorée) //F -- *MOVIES_EILayer\\sndset\\dataType* (colonne ignorée) //G -- *MOVIES_EILayer\\sndset\\beamType* (colonne ignorée) //H -- *MOVIES_EILayer\\sndset\\acousticFrequency* (colonne ignorée) //I -- *MOVIES_EILayer\\sndset\\startSample* (colonne ignorée) //J -- *MOVIES_EILayer\\sndset\\mainBeamAlongSteeringAngle* (colonne ignorée) //K -- *MOVIES_EILayer\\sndset\\mainBeamAthwartSteeringAngle* (colonne ignorée) //L -- *MOVIES_EILayer\\sndset\\absorptionCoef* (Float-NA) //M -- *MOVIES_EILayer\\sndset\\transmissionPower* (int) //N -- *MOVIES_EILayer\\sndset\\beamAlongAngleSensitivity* (Float) //O -- *MOVIES_EILayer\\sndset\\beamAthwartAngleSensitivity* (Float) //P -- *MOVIES_EILayer\\sndset\\beam3dBWidthAlong* (colonne ignorée) //Q -- *MOVIES_EILayer\\sndset\\beam3dBWidthAthwart* (colonne ignorée) //R -- *MOVIES_EILayer\\sndset\\beamEquTwoWayAngle* (Float) //S -- *MOVIES_EILayer\\sndset\\beamGain* (Float) //T -- *MOVIES_EILayer\\sndset\\beamSACorrection* (Float) //U -- *MOVIES_EILayer\\sndset\\bottomDetectionMinDepth* (colonne ignorée) //V -- *MOVIES_EILayer\\sndset\\bottomDetectionMaxDepth* (colonne ignorée) //W -- *MOVIES_EILayer\\sndset\\bottomDetectionMinLevel* (colonne ignorée) //X -- *MOVIES_EILayer\\sndset\\AlongTXRXWeightId* (colonne ignorée) //Y -- *MOVIES_EILayer\\sndset\\AthwartTXRXWeightId* (colonne ignorée) //Z -- *MOVIES_EILayer\\sndset\\SplitBeamAlongTXRXWeightId* (colonne ignorée) //AA -- *MOVIES_EILayer\\sndset\\SplitBeamAthwartTXRXWeightId* (colonne ignorée) //AB -- *MOVIES_EILayer\\sndset\\bandWidth* (colonne ignorée) //AC -- *MOVIES_EILayer\\sndset\\tvgminrange* (colonne ignorée) //AD -- *MOVIES_EILayer\\sndset\\tvgmaxrange* (colonne ignorée) //AE -- *MOVIES_EILayer\\sndset\\pulseduration* (Float) //AF -- *MOVIES_EILayer\\shipnav* (colonne ignorée) //AG -- *MOVIES_EILayer\\shipnav\\lat* (colonne ignorée) //AH -- *MOVIES_EILayer\\shipnav\\long* (colonne ignorée) //AI -- *MOVIES_EILayer\\shipnav\\alt* (colonne ignorée) //AJ -- *MOVIES_EILayer\\shipnav\\gndspeed* (colonne ignorée) //AK -- *MOVIES_EILayer\\shipnav\\gndcourse* (colonne ignorée) //AL -- *MOVIES_EILayer\\shipnav\\surfspeed* (colonne ignorée) //AM -- *MOVIES_EILayer\\shipnav\\surfcourse* (colonne ignorée) //AN -- *MOVIES_EILayer\\shipnav\\driftspeed* (colonne ignorée) //AO -- *MOVIES_EILayer\\shipnav\\driftcourse* (colonne ignorée) //AP -- *MOVIES_EILayer\\shipnav\\heading* (colonne ignorée) //AQ -- *MOVIES_EILayer\\shipnav\\roll* (colonne ignorée) //AR -- *MOVIES_EILayer\\shipnav\\pitch* (colonne ignorée) //AS -- *MOVIES_EILayer\\shipnav\\heave* (colonne ignorée) //AT -- *MOVIES_EILayer\\shipnav\\depth* //AU -- *MOVIES_EILayer\\shipnav\\draught* (colonne ignorée) //AV -- *MOVIES_EILayer\\cellset* (colonne ignorée) //AW -- *MOVIES_EILayer\\cellset\\cellnum* (int) //AX -- *MOVIES_EILayer\\cellset\\celltype* (int) //AY -- *MOVIES_EILayer\\cellset\\depthstart* (float) //AZ -- *MOVIES_EILayer\\cellset\\depthend* (float) //BA -- *MOVIES_EILayer\\cellset\\indexstart* (colonne ignorée) //BB -- *MOVIES_EILayer\\cellset\\indexend* (colonne ignorée) //BC -- *MOVIES_EILayer\\cellset\\datestart* (date) //BD -- *MOVIES_EILayer\\cellset\\dateend* (date) //BE -- *MOVIES_EILayer\\cellset\\lat* (Float) //BF -- *MOVIES_EILayer\\cellset\\long* (Float) //BG -- *MOVIES_EILayer\\cellset\\volume* (Integer-NA) //BH -- *MOVIES_EILayer\\cellset\\area* (int) //BI -- *MOVIES_EILayer\\cellset\\diststart* (colonne ignorée) //BJ -- *MOVIES_EILayer\\cellset\\distend* (colonne ignorée) //BK -- *MOVIES_EILayer\\cellset\\thresholdup* (int) //BL -- *MOVIES_EILayer\\cellset\\thresholdlow* (int) //BM -- *MOVIES_EILayer\\eilayer* (colonne ignorée) //BN -- *MOVIES_EILayer\\eilayer\\sa* (Float-NA)//BO -- *MOVIES_EILayer\\eilayer\\sv* (colonne ignorée) //BP -- *MOVIES_EILayer\\eilayer\\ni* (Integer-NA) //BQ -- *MOVIES_EILayer\\eilayer\\nt* (Integer-NA)//BR -- *MOVIES_EILayer\\boterr* (colonne ignorée) //BR -- *MOVIES_EILayer\\boterr\\sa* (colonne ignorée) //BT -- *MOVIES_EILayer\\boterr\\ni* (colonne ignorée) //BU -- *MOVIES_EILayer\\sndset\\soundcelerity*//BV -- *dataQuality* FK(DataQuality#qualityDataFlagValues) //E - Exemple ------- @@ -449,11 +639,19 @@ Format des colonnes ------------------- -- echotypeName -- meaning -- voyage FK(Voyage#name) -- depthStratumId FK(DepthStratum#id) -- baracoudaCode FK(Species#baracoudaCode) ++-----------------+-------------------------+ +| Colonne | Type | ++=================+=========================+ +| echotypeName |text | ++-----------------+-------------------------+ +| meaning |text | ++-----------------+-------------------------+ +| voyage |FK(Voyage#name) | ++-----------------+-------------------------+ +| depthStratumId |FK(DepthStratum#id) | ++-----------------+-------------------------+ +| baracoudaCode |FK(Species#baracoudaCode)| ++-----------------+-------------------------+ Exemple ------- @@ -476,12 +674,21 @@ Format des colonnes ------------------- -- aParameter (float) -- bParameter (float) -- voyage FK(Voyage#name) -- sizeCategory FK(SizeCategory#name) -- baracoudaCode FK(Species#baracoudaCode) -- strata FK(Strata#name) ++----------------+-------------------------+ +| Colonne | Type | ++================+=========================+ +| aParameter |(float) | ++----------------+-------------------------+ +| bParameter |(float) | ++----------------+-------------------------+ +| voyage |FK(Voyage#name) | ++----------------+-------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++----------------+-------------------------+ +| baracoudaCode |FK(Species#baracoudaCode)| ++----------------+-------------------------+ +| strata |FK(Strata#name) | ++----------------+-------------------------+ Exemple ------- @@ -504,13 +711,23 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- age (int) -- length (float) -- percentAtAge (float) -- metadata -- strata FK(Strata#name) -- baracoudaCode FK(Species#baracoudaCode) ++----------------+-------------------------+ +| Colonne | Type | ++================+=========================+ +| voyage |FK(Voyage#name) | ++----------------+-------------------------+ +| age |(int) | ++----------------+-------------------------+ +| length |(float) | ++----------------+-------------------------+ +| percentAtAge |(float) | ++----------------+-------------------------+ +| metadata |text | ++----------------+-------------------------+ +| strata |FK(Strata#name) | ++----------------+-------------------------+ +| baracoudaCode |FK(Species#baracoudaCode)| ++----------------+-------------------------+ Exemple ------- @@ -536,11 +753,19 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- name FK(esdu cell) -- echotype FK(Echotype#name) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) ++----------------+-------------------------------------------------------------+ +| Colonne | Type | ++================+=============================================================+ +| voyage |FK(Voyage#name) | ++----------------+-------------------------------------------------------------+ +| name |FK(esdu cell) | ++----------------+-------------------------------------------------------------+ +| echotype |FK(Echotype#name) | ++----------------+-------------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------+-------------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer) | ++----------------+-------------------------------------------------------------+ Exemple ------- @@ -563,13 +788,23 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- name FK(esdu cell) -- echotype FK(Echotype#name) -- sizeCategory FK(SizeCategory#name) -- baracoudaCode FK(Species#baracoudaCode) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) ++----------------+-------------------------------------------------------------+ +| Colonne | Type | ++================+=============================================================+ +| voyage |FK(Voyage#name) | ++----------------+-------------------------------------------------------------+ +| name |FK(esdu cell) | ++----------------+-------------------------------------------------------------+ +| echotype |FK(Echotype#name) | ++----------------+-------------------------------------------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++----------------+-------------------------------------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------+-------------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------+-------------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer) | ++----------------+-------------------------------------------------------------+ Exemple ------- @@ -592,13 +827,23 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- name FK(esdu cell) -- baracoudaCode FK(Species#baracoudaCode) -- ageCategory -- ageCategoryMeaning -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) ++----------------------+-------------------------------------------------------+ +| Colonne | Type | ++======================+=======================================================+ +| voyage |FK(Voyage#name) | ++----------------------+-------------------------------------------------------+ +| name |FK(esdu cell) | ++----------------------+-------------------------------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------------+-------------------------------------------------------+ +| ageCategory |text | ++----------------------+-------------------------------------------------------+ +| ageCategoryMeaning |text | ++----------------------+-------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------------+-------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer)| ++----------------------+-------------------------------------------------------+ Exemple ------- @@ -621,13 +866,23 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- name FK(esdu cell) -- baracoudaCode FK(Species#baracoudaCode) -- sizeCategory -- sizeCategoryMeaning -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) ++----------------------+-------------------------------------------------------+ +| Colonne | Type | ++======================+=======================================================+ +| voyage |FK(Voyage#name) | ++----------------------+-------------------------------------------------------+ +| name |FK(esdu cell) | ++----------------------+-------------------------------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------------+-------------------------------------------------------+ +| sizeCategory |text | ++----------------------+-------------------------------------------------------+ +| sizeCategoryMeaning |text | ++----------------------+-------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------------+-------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer)| ++----------------------+-------------------------------------------------------+ Exemple ------- @@ -653,12 +908,21 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- cellType FK(CellType) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- name -- regionEnvCoordinates -- surface (float) ++-----------------------+------------------------------------------------------+ +| Colonne | Type | ++=======================+======================================================+ +| voyage |FK(Voyage#name) | ++-----------------------+------------------------------------------------------+ +| cellType |FK(CellType) | ++-----------------------+------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++-----------------------+------------------------------------------------------+ +| name |text | ++-----------------------+------------------------------------------------------+ +| regionEnvCoordinates |text | ++-----------------------+------------------------------------------------------+ +| surface |(float) | ++-----------------------+------------------------------------------------------+ Exemple ------- @@ -681,9 +945,15 @@ Format des colonnes ------------------- -- voyage FK(Voyage) -- regionName FK(Cell#name) -- esduName FK(Cell#name) ++-----------------------+------------------------------------------------------+ +| Colonne | Type | ++=======================+======================================================+ +| voyage |FK(Voyage) | ++-----------------------+------------------------------------------------------+ +| regionName |FK(Cell#name) | ++-----------------------+------------------------------------------------------+ +| esduName |FK(Cell#name) | ++-----------------------+------------------------------------------------------+ Exemple ------- @@ -706,13 +976,23 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- name FK(Cell#name) -- baracoudaCode FK(Species#baracoudaCode) -- echotype FK(Echotype#name) -- sizeCategory FK(SizeCategory#name) -- dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) ++----------------------+-------------------------------------------------------+ +| Colonne | Type | ++======================+=======================================================+ +| voyage |FK(Voyage#name) | ++----------------------+-------------------------------------------------------+ +| name |FK(Cell#name) | ++----------------------+-------------------------------------------------------+ +| baracoudaCode |FK(Species#baracoudaCode) | ++----------------------+-------------------------------------------------------+ +| echotype |FK(Echotype#name) | ++----------------------+-------------------------------------------------------+ +| sizeCategory |FK(SizeCategory#name) | ++----------------------+-------------------------------------------------------+ +| dataQuality |FK(DataQuality#qualityDataFlagValues) | ++----------------------+-------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer)| ++----------------------+-------------------------------------------------------+ Exemple ------- @@ -738,19 +1018,35 @@ Format des colonnes ------------------- -- 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) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) ++----------------------+-------------------------------------------------------+ +| Colonne | Type | ++======================+=======================================================+ +| voyage |FK(Voyage#name) | ++----------------------+-------------------------------------------------------+ +| name |text | ++----------------------+-------------------------------------------------------+ +| 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) | ++----------------------+-------------------------------------------------------+ +| méta-données |FK(DataMetadata#name) (une colonne par méta à importer)| ++----------------------+-------------------------------------------------------+ Exemple -------

1 0

r822 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/entities echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb echobase-domain/src/main/resources/META-INF/services echobase-domain/src/main/xmi echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery echobase-ui echobase-ui/src/main/java/fr/ifremer/echobase/ui
by tchemit＠users.forge.codelutin.com July 15, 2013

July 15, 2013

Author: tchemit Date: 2013-07-15 10:32:35 +0200 (Mon, 15 Jul 2013) New Revision: 822 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/822 Log: fixes #2875: Normalisation du nom des requ?\195?\168tes Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueries.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java Modified: trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.internalDb.MigrationCallBackForVersion trunk/echobase-domain/src/main/xmi/echobase-internal.properties trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java trunk/echobase-ui/deploy.sh trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueries.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueries.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueries.java 2013-07-15 08:32:35 UTC (rev 822) @@ -0,0 +1,41 @@ +package fr.ifremer.echobase.entities; + +/* + * #%L + * EchoBase :: Domain + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2013 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% + */ + +import java.util.regex.Pattern; + +/** + * Useful methods aroud {@link ExportQuery}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.2 + */ +public class ExportQueries { + + protected static final Pattern NAME_PATTERN = Pattern.compile("[\\d\\w_-]+"); + + public static boolean isQueryNameValid(String queryName) { + return NAME_PATTERN.matcher(queryName).matches(); + } +} Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueries.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java (rev 0) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java 2013-07-15 08:32:35 UTC (rev 822) @@ -0,0 +1,111 @@ +package fr.ifremer.echobase.persistence.migration.internalDb; + +/* + * #%L + * EchoBase :: Domain + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2013 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% + */ + +import fr.ifremer.echobase.entities.ExportQueries; +import fr.ifremer.echobase.entities.ExportQuery; +import fr.ifremer.echobase.entities.ExportQueryImpl; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaSQLQuery; +import org.nuiton.util.Version; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.List; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since TODO + */ +public class MigrationCallBackForVersion2_2 extends MigrationCallBackForVersion { + @Override + public Version getVersion() { + return new Version("2.2"); + } + + public static final String EXPORT_QUERY_UPDATE = + "UPDATE exportquery SET name = '%s', topiaversion = topiaversion + 1 WHERE topiaid = '%s'"; + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + // normalize queries names + normalizeExportQueryNames(tx, queries); + } + + protected void normalizeExportQueryNames(TopiaContextImplementor tx, List<String> queries) { + + TopiaSQLQuery<ExportQuery> query = new TopiaSQLQuery<ExportQuery>() { + @Override + protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + PreparedStatement result = connection.prepareStatement("select topiaid, name from exportquery;"); + return result; + } + + @Override + protected ExportQuery prepareResult(ResultSet set) throws SQLException { + ExportQuery result = new ExportQueryImpl(); + result.setTopiaId(set.getString(1)); + result.setName(set.getString(2)); + return result; + } + }; + + List<ExportQuery> exportQueries = query.findMultipleResult(tx); + + for (ExportQuery exportQuery : exportQueries) { + String queryName = exportQuery.getName(); + if (!ExportQueries.isQueryNameValid(queryName)) { + + // rename query (replace all none acceptable caracters by *_*) + StringBuilder nameBuilder = new StringBuilder(); + boolean nameHasChanged = false; + for (char c : queryName.toCharArray()) { + if (ExportQueries.isQueryNameValid(String.valueOf(c))) { + nameBuilder.append(c); + } else { + nameBuilder.append('_'); + nameHasChanged = true; + } + } + if (nameHasChanged) { + + // resave with normalized name + String newQueryName = nameBuilder.toString(); + + queries.add(String.format(EXPORT_QUERY_UPDATE, newQueryName, exportQuery.getTopiaId())); + } + } + } + } + + +} Property changes on: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.internalDb.MigrationCallBackForVersion =================================================================== --- trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.internalDb.MigrationCallBackForVersion 2013-07-15 08:32:13 UTC (rev 821) +++ trunk/echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.internalDb.MigrationCallBackForVersion 2013-07-15 08:32:35 UTC (rev 822) @@ -0,0 +1 @@ +fr.ifremer.echobase.persistence.migration.internalDb.MigrationCallBackForVersion2_2 \ No newline at end of file Modified: trunk/echobase-domain/src/main/xmi/echobase-internal.properties =================================================================== --- trunk/echobase-domain/src/main/xmi/echobase-internal.properties 2013-07-15 08:32:13 UTC (rev 821) +++ trunk/echobase-domain/src/main/xmi/echobase-internal.properties 2013-07-15 08:32:35 UTC (rev 822) @@ -25,7 +25,7 @@ model.tagValue.generateOperatorForDAOHelper=true model.tagValue.generateStandaloneEnumForDAOHelper=true model.tagValue.constantPrefix=PROPERTY_ -model.tagValue.version=1.3 +model.tagValue.version=2.2 model.tagValue.noPCS=true model.tagValue.doNotGenerateBooleanGetMethods=true model.tagValue.indexForeignKeys=true Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java 2013-07-15 08:32:13 UTC (rev 821) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportquery/ExportQueryService.java 2013-07-15 08:32:35 UTC (rev 822) @@ -26,6 +26,7 @@ import com.google.common.base.Charsets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUser; +import fr.ifremer.echobase.entities.ExportQueries; import fr.ifremer.echobase.entities.ExportQuery; import fr.ifremer.echobase.entities.ExportQueryDAO; import fr.ifremer.echobase.services.EchoBaseServiceSupport; @@ -37,7 +38,6 @@ import java.util.List; import java.util.Map; -import java.util.regex.Pattern; /** * Service to deal with sql export. @@ -63,7 +63,6 @@ return entityToSave; } - protected static final Pattern NAME_PATTERN = Pattern.compile("[\\d\\w_-]+"); public ExportQuery createOrUpdate(ExportQuery exportQuery, EchoBaseUser user) throws ExportQueryNameAlreadyExistException, ExportQueryInvalidNameException { @@ -78,7 +77,7 @@ String queryName = exportQuery.getName(); - if (!NAME_PATTERN.matcher(queryName).matches()) { + if (!ExportQueries.isQueryNameValid(queryName)) { // can not accept a non alpha numeric name throw new ExportQueryInvalidNameException(); Property changes on: trunk/echobase-ui/deploy.sh ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java 2013-07-15 08:32:13 UTC (rev 821) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java 2013-07-15 08:32:35 UTC (rev 822) @@ -24,7 +24,6 @@ package fr.ifremer.echobase.ui; import com.opensymphony.xwork2.ActionContext; -import fr.ifremer.echobase.persistence.EchoBaseEntityHelper; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -54,7 +53,7 @@ } @Override - protected synchronized TopiaContext beginTransaction(ServletRequest request) { + protected /*synchronized*/ TopiaContext beginTransaction(ServletRequest request) { EchoBaseApplicationContext applicationContext = EchoBaseActionSupport.getEchoBaseApplicationContext(); @@ -66,18 +65,18 @@ return transaction; } - /** - * 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.0 - */ - protected void onCloseTransaction(TopiaContext transaction) { - //FIXME Check if this necessary any longer ? - EchoBaseEntityHelper.closeConnection(transaction); - } +// /** +// * 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.0 +// */ +// protected void onCloseTransaction(TopiaContext transaction) { +// //FIXME Check if this necessary any longer ? +// EchoBaseEntityHelper.closeConnection(transaction); +// } // public static void closeConnection(TopiaContext transaction) { // if (transaction == null) {

1 0

r821 - trunk/echobase-ui/src/main/webapp
by tchemit＠users.forge.codelutin.com July 15, 2013

July 15, 2013

Author: tchemit Date: 2013-07-15 10:32:13 +0200 (Mon, 15 Jul 2013) New Revision: 821 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/821 Log: fixes #2876: Utiliser le favicon d'echobase pour les application embarqu?\195?\169e Modified: trunk/echobase-ui/src/main/webapp/favicon_lutin.png Property changes on: trunk/echobase-ui/src/main/webapp/favicon_lutin.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r820 - in trunk: echobase-ui/src/main/webapp src/site/en/rst src/site/rst
by tchemit＠users.forge.codelutin.com July 14, 2013

July 14, 2013

Author: tchemit Date: 2013-07-14 09:11:50 +0200 (Sun, 14 Jul 2013) New Revision: 820 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/820 Log: add echobase favicon + fix some typo in importData doc Added: trunk/echobase-ui/src/main/webapp/favicon_lutin.png Modified: trunk/echobase-ui/src/main/webapp/favicon.png trunk/src/site/en/rst/importData.rst trunk/src/site/rst/importData.rst Modified: trunk/echobase-ui/src/main/webapp/favicon.png =================================================================== (Binary files differ) Added: trunk/echobase-ui/src/main/webapp/favicon_lutin.png =================================================================== (Binary files differ) Property changes on: trunk/echobase-ui/src/main/webapp/favicon_lutin.png ___________________________________________________________________ Added: svn:mime-type + image/png Modified: trunk/src/site/en/rst/importData.rst =================================================================== --- trunk/src/site/en/rst/importData.rst 2013-07-14 06:19:21 UTC (rev 819) +++ trunk/src/site/en/rst/importData.rst 2013-07-14 07:11:50 UTC (rev 820) @@ -151,7 +151,7 @@ :: title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring - Arlequin2 / la colombine942OBS01 SUR;942OBS;SUR;942OBS,P5001,SUR;PELGAS2011;Arlequin2 / la colombine;2011-04-27 09:10:00.0000;2011-04-27 09:10:00.0000;2011-04-27 10:39:00.0000";-1.5896666667;43.7055;110;-1.541;43.7606666667;110;"-176453.0000037 4851310.5,-171051 4857434.0000037 + Arlequin2 / la colombine942OBS01 SUR;942OBS;SUR;942OBS,P5001,SUR;PELGAS2011;Arlequin2 / la colombine;2011-04-27 09:10:00.0000;2011-04-27 09:10:00.0000;2011-04-27 10:39:00.0000;-1.5896666667;43.7055;110;-1.541;43.7606666667;110;-176453.0000037 4851310.5,-171051 4857434.0000037 Operation / OperationMetadataValue / GearMetadataValue ====================================================== @@ -188,7 +188,7 @@ :: vesselName;operationId;depthStratumId;gearShootingStartTime;midHaulLatitude;midHaulLongitude;gearShootingStartLatitude;gearShootingStartLongitude;gearShootingEndTime;gearShootingEndLatitude;gearShootingEndLongitude;gearCode - THALASSA II;P0422;CLAS;2011-05-05 06:49:50.0000";45.4165605;-1.4492292;45.4029733;-1.4860902;"2011-05-05 07:42:19.0000";45.4301477;-1.4123682;"57x52 + THALASSA II;P0422;CLAS;2011-05-05 06:49:50.0000;45.4165605;-1.4492292;45.4029733;-1.4860902;2011-05-05 07:42:19.0000;45.4301477;-1.4123682;57x52 OperationMetadataValue ~~~~~~~~~~~~~~~~~~~~~~ @@ -214,7 +214,7 @@ :: vesselName;operationId;metadataType;operationMetadataValue - THALASSA II;P0422;MeanWaterDepth";43.42 + THALASSA II;P0422;MeanWaterDepth;43.42 GearMetadataValue ~~~~~~~~~~~~~~~~~ @@ -241,7 +241,7 @@ :: vesselName;operationId;gearCode;metadataType;gearMetadataValue - THALASSA II;P0422;57x52;CableLength";31.6666666666667 + THALASSA II;P0422;57x52;CableLength;31.6666666666667 TotalSample / SubSample / BiometrySample ======================================== @@ -275,7 +275,7 @@ :: operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight - P0435;ALLO-TEZ;0";0.21;36;6.4;6;166.66;0.03 + P0435;ALLO-TEZ;0;0.21;36;6.4;6;166.66;0.03 SubSample ~~~~~~~~~ @@ -308,7 +308,7 @@ :: operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round - P0372;ENGR-ENC";0;"N";3.37;198;12;7;0.08;0;5 + P0372;ENGR-ENC;0;N;3.37;198;12;7;0.08;0;5 BiometrySample ~~~~~~~~~~~~~~ @@ -336,7 +336,7 @@ :: operationId;baracoudaCode;numFish;dataLabel;dataValue;name - P5002;ENGR-ENC";9394;NA;-1;"Age + P5002;ENGR-ENC;9394;NA;-1;Age Acoustic ~~~~~~~~ @@ -359,7 +359,7 @@ :: MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EILayer\sndset\beamAlongAngleSensitivity;MOVIES_EILayer\sndset\beamAthwartAngleSensitivity;MOVIES_EILayer\sndset\beam3dBWidthAlong;MOVIES_EILayer\sndset\beam3dBWidthAthwart;MOVIES_EILayer\sndset\beamEquTwoWayAngle;MOVIES_EILayer\sndset\beamGain;MOVIES_EILayer\sndset\beamSACorrection;MOVIES_EILayer\sndset\bottomDetectionMinDepth;MOVIES_EILayer\sndset\bottomDetectionMaxDepth;MOVIES_EILayer\sndset\bottomDetectionMinLevel;MOVIES_EILayer\sndset\AlongTXRXWeightId;MOVIES_EILayer\sndset\AthwartTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAlongTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAthwartTXRXWeightId;MOVIES_EILayer\sndset\bandWidth;MOVIES_EILayer\sndset\tvgminrange;MOVIES_EILayer\sndset\tvgmaxrange;MOVIES_EILayer\sndset\pulseduration;MOVIES_EILayer\shipnav;MOVIES_EILayer\shipnav\lat;MOVIES_EILayer\shipnav\long;MOVIES_EILayer\shipnav\alt;MOVIES_EILayer\shipnav\gndspeed;MOVIES_EILayer\shipnav\gndcourse;MOVIES_EILayer\shipnav\surfspeed;MOVIES_EILayer\shipnav\surfcourse;MOVIES_EILayer\shipnav\driftspeed;MOVIES_EILayer\shipnav\driftcourse;MOVIES_EILayer\shipnav\heading;MOVIES_EILayer\shipnav\roll;MOVIES_EILayer\shipnav\pitch;MOVIES_EILayer\shipnav\heave;MOVIES_EILayer\shipnav\depth;MOVIES_EILayer\shipnav\draught;MOVIES_EILayer\cellset;MOVIES_EILayer\cellset\cellnum;MOVIES_EILayer\cellset\celltype;MOVIES_EILayer\cellset\depthstart;MOVIES_EILayer\cellset\depthend;MOVIES_EILayer\cellset\indexstart;MOVIES_EILayer\cellset\indexend;MOVIES_EILayer\cellset\datestart;MOVIES_EILayer\cellset\dateend;MOVIES_EILayer\cellset\lat;MOVIES_EILayer\cellset\long;MOVIES_EILayer\cellset\volume;MOVIES_EILayer\cellset\area;MOVIES_EILayer\cellset\diststart;MOVIES_EILayer\cellset\distend;MOVIES_EILayer\cellset\thresholdup;MOVIES_EILayer\cellset\thresholdlow;MOVIES_EILayer\eilayer;MOVIES_EILayer\eilayer\sa;MOVIES_EILayer\eilayer\sv;MOVIES_EILayer\eilayer\ni;MOVIES_EILayer\eilayer\nt;MOVIES_EILayer\boterr;MOVIES_EILayer\boterr\sa;MOVIES_EILayer\boterr\ni;MOVIES_EILayer\sndset\soundcelerity;dataQuality - 2011/06/23 10:09:00.0000";NA;NA;NA;47;38000;NA;NA;NA;NA;NA;NA;8.47;2000;21.8;21.8;NA;NA;-20.6;25.27;-0.529999;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;1.024;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;199.9;NA;NA;0;0;10;20;NA;NA;"2011-04-26 08:24:02.0000;2011-04-26 08:30:02.0000";43.666505;-3.48812666666667;NA;1;NA;NA;0;-60;NA;1.444008;NA;71;43424;NA;NA;NA;"variable";1 + 2011/06/23 10:09:00.0000;NA;NA;NA;47;38000;NA;NA;NA;NA;NA;NA;8.47;2000;21.8;21.8;NA;NA;-20.6;25.27;-0.529999;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;1.024;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;199.9;NA;NA;0;0;10;20;NA;NA;2011-04-26 08:24:02.0000;2011-04-26 08:30:02.0000;43.666505;-3.48812666666667;NA;1;NA;NA;0;-60;NA;1.444008;NA;71;43424;NA;NA;NA;variable;1 Résultats voyage ================ @@ -417,7 +417,7 @@ :: voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata - PELGAS2011";0;2.48253468289872;3.37866337729714;"ENGR-ENC;Golfe de Gascogne + PELGAS2011;0;2.48253468289872;3.37866337729714;ENGR-ENC;Golfe de Gascogne LengthAgeKey ~~~~~~~~~~~~ @@ -446,7 +446,7 @@ :: voyage;baracoudaCode;age;length;percentAtAge;metadata;strata - PELGAS2011;ENGR-ENC";1;7.5;1;"Ifremer reading;Golfe de Gascogne + PELGAS2011;ENGR-ENC;1;7.5;1;Ifremer reading;Golfe de Gascogne Résultats Esdu ============== @@ -464,10 +464,10 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- name FK(esdu cell) -- echotype FK(Echotype#name) -- dataQuality FK(DataQuality#qualityDataFlagValues) +- voyage FK(Voyage#name) +- name FK(esdu cell) +- echotype FK(Echotype#name) +- dataQuality FK(DataQuality#qualityDataFlagValues) - méta-données FK(DataMetadata#name) (une colonne par méta à importer) Exemple @@ -476,7 +476,7 @@ :: voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality - PELGAS2011;2011-04-26 13:29:12.0000;D1";0;"P0379;P0379";1 + PELGAS2011;2011-04-26 13:29:12.0000;D1;0;P0379;P0379;1 Esdu / Echotype / Species Category ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -497,7 +497,7 @@ - sizeCategory FK(SizeCategory#name) - baracoudaCode FK(Species#baracoudaCode) - dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) Exemple ------- @@ -505,7 +505,7 @@ :: voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality - PELGAS2011;2011-04-26 13:29:12.0000;D1;COMP-LEM;0";4;0;20;0.05;0;0.00100292822891053;0;0;0;1 + PELGAS2011;2011-04-26 13:29:12.0000;D1;COMP-LEM;0;4;0;20;0.05;0;0.00100292822891053;0;0;0;1 Esdu / Species / Age Category ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -526,7 +526,7 @@ - ageCategory - ageCategoryMeaning - dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) Exemple ------- @@ -534,7 +534,7 @@ :: name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage - 2011-04-26 13:35:19.0000;ENGR-ENC";3;3377.00492644042;"fish age-group (years)";1;"PELGAS2011 + 2011-04-26 13:35:19.0000;ENGR-ENC;3;3377.00492644042;fish age-group (years);1;PELGAS2011 Esdu / Species / Size Category ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -555,7 +555,7 @@ - sizeCategory - sizeCategoryMeaning - dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) Exemple ------- @@ -563,7 +563,7 @@ :: name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage - 2011-04-26 13:35:19.0000;MICR-POU";4;5190.7652880528;1297691.3220132;"mid point of 1 cm size bin";1;"PELGAS2011 + 2011-04-26 13:35:19.0000;MICR-POU;4;5190.7652880528;1297691.3220132;mid point of 1 cm size bin;1;PELGAS2011 Region ====== @@ -594,7 +594,7 @@ :: voyage;name;cellType;regionEnvCoordinates;surface;dataQuality - PELGAS2011";1;"RegionCLAS;-1.40644893137726 43.8651260867463 50";1224.75678263326;1 + PELGAS2011;1;RegionCLAS;-1.40644893137726 43.8651260867463 50;1224.75678263326;1 Region Association ~~~~~~~~~~~~~~~~~~ @@ -619,7 +619,7 @@ :: voyage;regionName;esduName - PELGAS2011";1;"2011-05-02 09:36:54.0000 + PELGAS2011;1;2011-05-02 09:36:54.0000 Region results ~~~~~~~~~~~~~~ @@ -640,7 +640,7 @@ - echotype FK(Echotype#name) - sizeCategory FK(SizeCategory#name) - dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) Exemple ------- @@ -648,7 +648,7 @@ :: voyage;name;baracoudaCode;sizeCategory;echotype;VarianceXe;VarianceNASC;MeanXe;MeanNASC;NASCWeightedMeanXe;Nesdu;Nhauls;MeanNASCWeightedBiomassDensity;NASCWeightedEstimationVariance;NASCWeightedEstimationCV;MeanBiomassDensity;EstimationVariance;EstimationCV;TotalEstimationVariance;TotalNASCWeightedEstimationVariance;ProportionOfTotalEstimationVariance;ProportionOfNASCWeightedTotalEstimationVariance;Biomass;NASCWeightedBiomass;dataQuality - PELGAS2011;6;CLUP-HAR;0;D2";NA;8963.28501789053;0.127534943481966;19.0945142790179;0.127534943481966;448;1;2.43521779939014;NA;NA;2.43521779939014;NA;NA;0;0;NA;NA;14380.2052341515;14380.2052341515;1 + PELGAS2011;6;CLUP-HAR;0;D2;NA;8963.28501789053;0.127534943481966;19.0945142790179;0.127534943481966;448;1;2.43521779939014;NA;NA;2.43521779939014;NA;NA;0;0;NA;NA;14380.2052341515;14380.2052341515;1 Map === @@ -678,7 +678,7 @@ - gridLongitudeLag (float) - gridLatitudeLag (float) - gridDepthLag (float) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) Exemple ------- @@ -686,4 +686,4 @@ :: voyage;name;baracoudaCode;sizeCategory;ageCategory;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality - PELGAS2011;-6 43.5 0;ENGR-ENC";0;;-6;43.5;0;0.25;0.25;0;0;1 + PELGAS2011;-6 43.5 0;ENGR-ENC;0;;-6;43.5;0;0.25;0.25;0;0;1 Modified: trunk/src/site/rst/importData.rst =================================================================== --- trunk/src/site/rst/importData.rst 2013-07-14 06:19:21 UTC (rev 819) +++ trunk/src/site/rst/importData.rst 2013-07-14 07:11:50 UTC (rev 820) @@ -149,7 +149,7 @@ :: title;transectAbstract;stratum;comment;voyage;vesselName;dateCreated;timeCoverageStart;timeCoverageEnd;geospatialLonMin;geospatialLatMin;geospatialVerticalMin;geospatialLonMax;geospatialLatMax;geospatialVerticalMax;linestring - Arlequin2 / la colombine942OBS01 SUR;942OBS;SUR;942OBS,P5001,SUR;PELGAS2011;Arlequin2 / la colombine;2011-04-27 09:10:00.0000;2011-04-27 09:10:00.0000;2011-04-27 10:39:00.0000";-1.5896666667;43.7055;110;-1.541;43.7606666667;110;"-176453.0000037 4851310.5,-171051 4857434.0000037 + Arlequin2 / la colombine942OBS01 SUR;942OBS;SUR;942OBS,P5001,SUR;PELGAS2011;Arlequin2 / la colombine;2011-04-27 09:10:00.0000;2011-04-27 09:10:00.0000;2011-04-27 10:39:00.0000;-1.5896666667;43.7055;110;-1.541;43.7606666667;110;-176453.0000037 4851310.5,-171051 4857434.0000037 Operation / OperationMetadataValue / GearMetadataValue ====================================================== @@ -186,7 +186,7 @@ :: vesselName;operationId;depthStratumId;gearShootingStartTime;midHaulLatitude;midHaulLongitude;gearShootingStartLatitude;gearShootingStartLongitude;gearShootingEndTime;gearShootingEndLatitude;gearShootingEndLongitude;gearCode - THALASSA II;P0422;CLAS;2011-05-05 06:49:50.0000";45.4165605;-1.4492292;45.4029733;-1.4860902;"2011-05-05 07:42:19.0000";45.4301477;-1.4123682;"57x52 + THALASSA II;P0422;CLAS;2011-05-05 06:49:50.0000;45.4165605;-1.4492292;45.4029733;-1.4860902;2011-05-05 07:42:19.0000;45.4301477;-1.4123682;57x52 OperationMetadataValue ~~~~~~~~~~~~~~~~~~~~~~ @@ -212,7 +212,7 @@ :: vesselName;operationId;metadataType;operationMetadataValue - THALASSA II;P0422;MeanWaterDepth";43.42 + THALASSA II;P0422;MeanWaterDepth;43.42 GearMetadataValue ~~~~~~~~~~~~~~~~~ @@ -239,7 +239,7 @@ :: vesselName;operationId;gearCode;metadataType;gearMetadataValue - THALASSA II;P0422;57x52;CableLength";31.6666666666667 + THALASSA II;P0422;57x52;CableLength;31.6666666666667 TotalSample / SubSample / BiometrySample ======================================== @@ -273,7 +273,7 @@ :: operationId;baracoudaCode;sizeCategory;sampleWeight;numberSampled;meanLength;meanWeight;noPerKg;sortedWeight - P0435;ALLO-TEZ;0";0.21;36;6.4;6;166.66;0.03 + P0435;ALLO-TEZ;0;0.21;36;6.4;6;166.66;0.03 SubSample ~~~~~~~~~ @@ -306,7 +306,7 @@ :: operationId;baracoudaCode;sizeCategory;sexCategory;sampleWeight;numberSampled;lengthClass;numberAtLength;weightAtLength;units;round - P0372;ENGR-ENC";0;"N";3.37;198;12;7;0.08;0;5 + P0372;ENGR-ENC;0;N;3.37;198;12;7;0.08;0;5 BiometrySample ~~~~~~~~~~~~~~ @@ -334,7 +334,7 @@ :: operationId;baracoudaCode;numFish;dataLabel;dataValue;name - P5002;ENGR-ENC";9394;NA;-1;"Age + P5002;ENGR-ENC;9394;NA;-1;Age Acoustic ~~~~~~~~ @@ -422,7 +422,7 @@ - *MOVIES_EILayer\\boterr* (colonne ignorée) //BR - *MOVIES_EILayer\\boterr\\sa* (colonne ignorée) //BT - *MOVIES_EILayer\\boterr\\ni* (colonne ignorée) //BU -- *MOVIES_EILayer\\sndset\\soundcelerity"//BV +- *MOVIES_EILayer\\sndset\\soundcelerity*//BV - *dataQuality* FK(DataQuality#qualityDataFlagValues) //E Exemple @@ -431,7 +431,7 @@ :: MOVIES_EILayer;MOVIES_EILayer\sndset;MOVIES_EILayer\sndset\sndname;MOVIES_EILayer\sndset\sndident;MOVIES_EILayer\sndset\softChannelId;MOVIES_EILayer\sndset\channelName;MOVIES_EILayer\sndset\dataType;MOVIES_EILayer\sndset\beamType;MOVIES_EILayer\sndset\acousticFrequency;MOVIES_EILayer\sndset\startSample;MOVIES_EILayer\sndset\mainBeamAlongSteeringAngle;MOVIES_EILayer\sndset\mainBeamAthwartSteeringAngle;MOVIES_EILayer\sndset\absorptionCoef;MOVIES_EILayer\sndset\transmissionPower;MOVIES_EILayer\sndset\beamAlongAngleSensitivity;MOVIES_EILayer\sndset\beamAthwartAngleSensitivity;MOVIES_EILayer\sndset\beam3dBWidthAlong;MOVIES_EILayer\sndset\beam3dBWidthAthwart;MOVIES_EILayer\sndset\beamEquTwoWayAngle;MOVIES_EILayer\sndset\beamGain;MOVIES_EILayer\sndset\beamSACorrection;MOVIES_EILayer\sndset\bottomDetectionMinDepth;MOVIES_EILayer\sndset\bottomDetectionMaxDepth;MOVIES_EILayer\sndset\bottomDetectionMinLevel;MOVIES_EILayer\sndset\AlongTXRXWeightId;MOVIES_EILayer\sndset\AthwartTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAlongTXRXWeightId;MOVIES_EILayer\sndset\SplitBeamAthwartTXRXWeightId;MOVIES_EILayer\sndset\bandWidth;MOVIES_EILayer\sndset\tvgminrange;MOVIES_EILayer\sndset\tvgmaxrange;MOVIES_EILayer\sndset\pulseduration;MOVIES_EILayer\shipnav;MOVIES_EILayer\shipnav\lat;MOVIES_EILayer\shipnav\long;MOVIES_EILayer\shipnav\alt;MOVIES_EILayer\shipnav\gndspeed;MOVIES_EILayer\shipnav\gndcourse;MOVIES_EILayer\shipnav\surfspeed;MOVIES_EILayer\shipnav\surfcourse;MOVIES_EILayer\shipnav\driftspeed;MOVIES_EILayer\shipnav\driftcourse;MOVIES_EILayer\shipnav\heading;MOVIES_EILayer\shipnav\roll;MOVIES_EILayer\shipnav\pitch;MOVIES_EILayer\shipnav\heave;MOVIES_EILayer\shipnav\depth;MOVIES_EILayer\shipnav\draught;MOVIES_EILayer\cellset;MOVIES_EILayer\cellset\cellnum;MOVIES_EILayer\cellset\celltype;MOVIES_EILayer\cellset\depthstart;MOVIES_EILayer\cellset\depthend;MOVIES_EILayer\cellset\indexstart;MOVIES_EILayer\cellset\indexend;MOVIES_EILayer\cellset\datestart;MOVIES_EILayer\cellset\dateend;MOVIES_EILayer\cellset\lat;MOVIES_EILayer\cellset\long;MOVIES_EILayer\cellset\volume;MOVIES_EILayer\cellset\area;MOVIES_EILayer\cellset\diststart;MOVIES_EILayer\cellset\distend;MOVIES_EILayer\cellset\thresholdup;MOVIES_EILayer\cellset\thresholdlow;MOVIES_EILayer\eilayer;MOVIES_EILayer\eilayer\sa;MOVIES_EILayer\eilayer\sv;MOVIES_EILayer\eilayer\ni;MOVIES_EILayer\eilayer\nt;MOVIES_EILayer\boterr;MOVIES_EILayer\boterr\sa;MOVIES_EILayer\boterr\ni;MOVIES_EILayer\sndset\soundcelerity;dataQuality - 2011/06/23 10:09:00.0000";NA;NA;NA;47;38000;NA;NA;NA;NA;NA;NA;8.47;2000;21.8;21.8;NA;NA;-20.6;25.27;-0.529999;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;1.024;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;199.9;NA;NA;0;0;10;20;NA;NA;"2011-04-26 08:24:02.0000;2011-04-26 08:30:02.0000";43.666505;-3.48812666666667;NA;1;NA;NA;0;-60;NA;1.444008;NA;71;43424;NA;NA;NA;"variable";1 + 2011/06/23 10:09:00.0000;NA;NA;NA;47;38000;NA;NA;NA;NA;NA;NA;8.47;2000;21.8;21.8;NA;NA;-20.6;25.27;-0.529999;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;1.024;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;NA;199.9;NA;NA;0;0;10;20;NA;NA;2011-04-26 08:24:02.0000;2011-04-26 08:30:02.0000;43.666505;-3.48812666666667;NA;1;NA;NA;0;-60;NA;1.444008;NA;71;43424;NA;NA;NA;variable;1 Résultats voyage ================ @@ -489,7 +489,7 @@ :: voyage;sizeCategory;aParameter;bParameter;baracoudaCode;strata - PELGAS2011";0;2.48253468289872;3.37866337729714;"ENGR-ENC;Golfe de Gascogne + PELGAS2011;0;2.48253468289872;3.37866337729714;ENGR-ENC;Golfe de Gascogne LengthAgeKey ~~~~~~~~~~~~ @@ -518,7 +518,7 @@ :: voyage;baracoudaCode;age;length;percentAtAge;metadata;strata - PELGAS2011;ENGR-ENC";1;7.5;1;"Ifremer reading;Golfe de Gascogne + PELGAS2011;ENGR-ENC;1;7.5;1;Ifremer reading;Golfe de Gascogne Résultats Esdu ============== @@ -536,10 +536,10 @@ Format des colonnes ------------------- -- voyage FK(Voyage#name) -- name FK(esdu cell) -- echotype FK(Echotype#name) -- dataQuality FK(DataQuality#qualityDataFlagValues) +- voyage FK(Voyage#name) +- name FK(esdu cell) +- echotype FK(Echotype#name) +- dataQuality FK(DataQuality#qualityDataFlagValues) - méta-données FK(DataMetadata#name) (une colonne par méta à importer) Exemple @@ -548,7 +548,7 @@ :: voyage;name;echotype;NASC;ReferenceStationCatch;ReferenceStationBiometry;dataQuality - PELGAS2011;2011-04-26 13:29:12.0000;D1";0;"P0379;P0379";1 + PELGAS2011;2011-04-26 13:29:12.0000;D1;0;P0379;P0379;1 Esdu / Echotype / Species Category ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -577,7 +577,7 @@ :: voyage;name;echotype;baracoudaCode;sizeCategory;ReferenceStationCatch;Biomass;MeanLength;MeanWeight;Abundance;SigmaSp;NASC;pondBiomass;pondAbundance;dataQuality - PELGAS2011;2011-04-26 13:29:12.0000;D1;COMP-LEM;0";4;0;20;0.05;0;0.00100292822891053;0;0;0;1 + PELGAS2011;2011-04-26 13:29:12.0000;D1;COMP-LEM;0;4;0;20;0.05;0;0.00100292822891053;0;0;0;1 Esdu / Species / Age Category ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -598,7 +598,7 @@ - ageCategory - ageCategoryMeaning - dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) Exemple ------- @@ -606,7 +606,7 @@ :: name;baracoudaCode;ageCategory;Abundance;ageCategoryMeaning;dataQuality;voyage - 2011-04-26 13:35:19.0000;ENGR-ENC";3;3377.00492644042;"fish age-group (years)";1;"PELGAS2011 + 2011-04-26 13:35:19.0000;ENGR-ENC;3;3377.00492644042;fish age-group (years);1;PELGAS2011 Esdu / Species / Size Category ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -627,7 +627,7 @@ - sizeCategory - sizeCategoryMeaning - dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) Exemple ------- @@ -635,7 +635,7 @@ :: name;baracoudaCode;sizeCategory;Biomass;Abundance;sizeCategoryMeaning;dataQuality;voyage - 2011-04-26 13:35:19.0000;MICR-POU";4;5190.7652880528;1297691.3220132;"mid point of 1 cm size bin";1;"PELGAS2011 + 2011-04-26 13:35:19.0000;MICR-POU;4;5190.7652880528;1297691.3220132;mid point of 1 cm size bin;1;PELGAS2011 Region ====== @@ -666,7 +666,7 @@ :: voyage;name;cellType;regionEnvCoordinates;surface;dataQuality - PELGAS2011";1;"RegionCLAS;-1.40644893137726 43.8651260867463 50";1224.75678263326;1 + PELGAS2011;1;RegionCLAS;-1.40644893137726 43.8651260867463 50;1224.75678263326;1 Region Association ~~~~~~~~~~~~~~~~~~ @@ -691,7 +691,7 @@ :: voyage;regionName;esduName - PELGAS2011";1;"2011-05-02 09:36:54.0000 + PELGAS2011;1;2011-05-02 09:36:54.0000 Region results ~~~~~~~~~~~~~~ @@ -712,7 +712,7 @@ - echotype FK(Echotype#name) - sizeCategory FK(SizeCategory#name) - dataQuality FK(DataQuality#qualityDataFlagValues) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) Exemple ------- @@ -720,7 +720,7 @@ :: voyage;name;baracoudaCode;sizeCategory;echotype;VarianceXe;VarianceNASC;MeanXe;MeanNASC;NASCWeightedMeanXe;Nesdu;Nhauls;MeanNASCWeightedBiomassDensity;NASCWeightedEstimationVariance;NASCWeightedEstimationCV;MeanBiomassDensity;EstimationVariance;EstimationCV;TotalEstimationVariance;TotalNASCWeightedEstimationVariance;ProportionOfTotalEstimationVariance;ProportionOfNASCWeightedTotalEstimationVariance;Biomass;NASCWeightedBiomass;dataQuality - PELGAS2011;6;CLUP-HAR;0;D2";NA;8963.28501789053;0.127534943481966;19.0945142790179;0.127534943481966;448;1;2.43521779939014;NA;NA;2.43521779939014;NA;NA;0;0;NA;NA;14380.2052341515;14380.2052341515;1 + PELGAS2011;6;CLUP-HAR;0;D2;NA;8963.28501789053;0.127534943481966;19.0945142790179;0.127534943481966;448;1;2.43521779939014;NA;NA;2.43521779939014;NA;NA;0;0;NA;NA;14380.2052341515;14380.2052341515;1 Map === @@ -750,7 +750,7 @@ - gridLongitudeLag (float) - gridLatitudeLag (float) - gridDepthLag (float) -- méta-données FK(DataMetadata#name) (une colonne par méta à importer) +- méta-données FK(DataMetadata#name) (une colonne par méta à importer) Exemple ------- @@ -758,4 +758,4 @@ :: voyage;name;baracoudaCode;sizeCategory;ageCategory;gridCellLongitude;gridCellLatitude;gridCellDepth;gridLongitudeLag;gridLatitudeLag;gridDepthLag;KrigedXe;dataQuality - PELGAS2011;-6 43.5 0;ENGR-ENC";0;;-6;43.5;0;0.25;0.25;0;0;1 + PELGAS2011;-6 43.5 0;ENGR-ENC;0;;-6;43.5;0;0.25;0.25;0;0;1

1 0

r819 - trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui
by tchemit＠users.forge.codelutin.com July 14, 2013

July 14, 2013

Author: tchemit Date: 2013-07-14 08:19:21 +0200 (Sun, 14 Jul 2013) New Revision: 819 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/819 Log: add a synchronized (arch now it does not work on demo instance... without it) Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java 2013-07-14 05:53:59 UTC (rev 818) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java 2013-07-14 06:19:21 UTC (rev 819) @@ -54,7 +54,7 @@ } @Override - protected /*synchronized*/ TopiaContext beginTransaction(ServletRequest request) { + protected synchronized TopiaContext beginTransaction(ServletRequest request) { EchoBaseApplicationContext applicationContext = EchoBaseActionSupport.getEchoBaseApplicationContext();

1 0

r818 - trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui
by tchemit＠users.forge.codelutin.com July 14, 2013

July 14, 2013

Author: tchemit Date: 2013-07-14 07:53:59 +0200 (Sun, 14 Jul 2013) New Revision: 818 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/818 Log: add a syncrhonized (in comments to fix some thread problem but now seems to work fine...) Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java 2013-07-14 05:52:08 UTC (rev 817) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java 2013-07-14 05:53:59 UTC (rev 818) @@ -54,7 +54,7 @@ } @Override - protected TopiaContext beginTransaction(ServletRequest request) { + protected /*synchronized*/ TopiaContext beginTransaction(ServletRequest request) { EchoBaseApplicationContext applicationContext = EchoBaseActionSupport.getEchoBaseApplicationContext();

1 0

r817 - trunk/echobase-ui
by tchemit＠users.forge.codelutin.com July 14, 2013

July 14, 2013

Author: tchemit Date: 2013-07-14 07:52:08 +0200 (Sun, 14 Jul 2013) New Revision: 817 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/817 Log: add a deploy script Added: trunk/echobase-ui/deploy.sh Added: trunk/echobase-ui/deploy.sh =================================================================== --- trunk/echobase-ui/deploy.sh (rev 0) +++ trunk/echobase-ui/deploy.sh 2013-07-14 05:52:08 UTC (rev 817) @@ -0,0 +1,6 @@ +#! /bin/sh +#mvn package +cp target/*.war /var/local/echobase +v=$( mvn help:evaluate -Dexpression=project.version | grep -v "INFO" | grep -v "WARNING" | grep -v "Download" ) +echo "version=$v" +(cd /var/local/echobase; ./deploy.sh $v ) \ No newline at end of file Property changes on: trunk/echobase-ui/deploy.sh ___________________________________________________________________ Added: svn:executable + * Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native

1 0

r816 - trunk/echobase-domain/src/main/resources/META-INF/services
by tchemit＠users.forge.codelutin.com July 11, 2013

July 11, 2013

Author: tchemit Date: 2013-07-11 18:58:49 +0200 (Thu, 11 Jul 2013) New Revision: 816 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/816 Log: refs #2870: Mise ?\195?\160 jour des librairies (changement du report de configuration) Added: trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider Removed: trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider Deleted: trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider =================================================================== --- trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider 2013-07-11 16:58:02 UTC (rev 815) +++ trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider 2013-07-11 16:58:49 UTC (rev 816) @@ -1 +0,0 @@ -fr.ifremer.echobase.EchoBaseApplicationConfigProvider \ No newline at end of file Copied: trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider (from rev 813, trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.util.ApplicationConfigProvider) =================================================================== --- trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider (rev 0) +++ trunk/echobase-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider 2013-07-11 16:58:49 UTC (rev 816) @@ -0,0 +1 @@ +fr.ifremer.echobase.EchoBaseApplicationConfigProvider \ No newline at end of file

1 0

r815 - trunk
by tchemit＠users.forge.codelutin.com July 11, 2013

July 11, 2013

Author: tchemit Date: 2013-07-11 18:58:02 +0200 (Thu, 11 Jul 2013) New Revision: 815 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/815 Log: refs #2870: Mise ?\195?\160 jour des librairies (changement du report de configuration) Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-07-11 16:51:18 UTC (rev 814) +++ trunk/pom.xml 2013-07-11 16:58:02 UTC (rev 815) @@ -505,7 +505,7 @@ <reportSets> <reportSet> <reports> - <report>aggregate-application-config-report</report> + <report>aggregate-config-report</report> </reports> </reportSet> </reportSets>

1 0

r814 - in trunk: . echobase-domain echobase-domain/src/main/java/fr/ifremer/echobase echobase-domain/src/main/java/fr/ifremer/echobase/entities echobase-domain/src/main/java/fr/ifremer/echobase/persistence echobase-domain/src/main/java/fr/ifremer/echobase/services echobase-domain/src/main/resources echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb echobase-services/src/main/java/fr/ifremer/echobase/services/i
by tchemit＠users.forge.codelutin.com July 11, 2013

July 11, 2013

Author: tchemit Date: 2013-07-11 18:51:18 +0200 (Thu, 11 Jul 2013) New Revision: 814 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/814 Log: refs #2870: Mise ?\195?\160 jour des librairies + migration topia 3.0 Modified: trunk/echobase-domain/pom.xml trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseApplicationConfigProvider.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryDAOImpl.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java trunk/echobase-domain/src/main/resources/echobase-internaldb.properties trunk/echobase-domain/src/main/resources/echobase-workingdb.properties trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseWorkingDbTransactionFilter.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java trunk/pom.xml Modified: trunk/echobase-domain/pom.xml =================================================================== --- trunk/echobase-domain/pom.xml 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/pom.xml 2013-07-11 16:51:18 UTC (rev 814) @@ -136,6 +136,11 @@ <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> </dependency> Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseApplicationConfigProvider.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseApplicationConfigProvider.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseApplicationConfigProvider.java 2013-07-11 16:51:18 UTC (rev 814) @@ -23,8 +23,9 @@ * #L% */ -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ApplicationConfigProvider; +import org.nuiton.util.config.ApplicationConfigProvider; +import org.nuiton.util.config.ConfigActionDef; +import org.nuiton.util.config.ConfigOptionDef; import java.util.Locale; @@ -49,12 +50,12 @@ } @Override - public ApplicationConfig.OptionDef[] getOptions() { + public ConfigOptionDef[] getOptions() { return EchoBaseConfigurationOption.values(); } @Override - public ApplicationConfig.ActionDef[] getActions() { - return new ApplicationConfig.ActionDef[0]; + public ConfigActionDef[] getActions() { + return new ConfigActionDef[0]; } } Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfiguration.java 2013-07-11 16:51:18 UTC (rev 814) @@ -27,8 +27,8 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.config.ApplicationConfig; +import org.nuiton.util.config.ArgumentsParserException; import org.nuiton.util.FileUtil; import org.nuiton.util.Version; Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/EchoBaseConfigurationOption.java 2013-07-11 16:51:18 UTC (rev 814) @@ -22,8 +22,8 @@ */ package fr.ifremer.echobase; -import org.nuiton.util.ApplicationConfig; import org.nuiton.util.Version; +import org.nuiton.util.config.ConfigOptionDef; import java.io.File; import java.net.URL; @@ -36,7 +36,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 0.1 */ -public enum EchoBaseConfigurationOption implements ApplicationConfig.OptionDef { +public enum EchoBaseConfigurationOption implements ConfigOptionDef { /** Main directory where to put echobase data (logs, and others...). */ DATA_DIRECTORY("echobase.data.directory", @@ -67,9 +67,9 @@ "${echobase.data.directory}/war/echobase-ui-${echobase.version}-embedded.war", File.class), DOCUMENTATION_URL("echobase.documentationUrl", - n_("echobase.config.documentationUrl.description"), - "http://maven-site.forge.codelutin.com/echobase", - URL.class); + n_("echobase.config.documentationUrl.description"), + "http://maven-site.forge.codelutin.com/echobase", + URL.class); /** Configuration key. */ protected final String key; Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryDAOImpl.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryDAOImpl.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/entities/ExportQueryDAOImpl.java 2013-07-11 16:51:18 UTC (rev 814) @@ -40,7 +40,7 @@ List<Object> params = Lists.<Object>newArrayList("name", queryName); if (StringUtils.isNotBlank(id)) { - hql += " AND " + ExportQuery.TOPIA_ID + " = :id"; + hql += " AND " + ExportQuery.PROPERTY_TOPIA_ID + " = :id"; params.add("id"); params.add(id); } Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java 2013-07-11 16:51:18 UTC (rev 814) @@ -123,18 +123,15 @@ log.debug("closing transaction " + transaction); } - try { - Transaction tx = ((TopiaContextImplementor) transaction).getHibernate().getTransaction(); - if (!tx.wasCommitted() && !tx.wasRolledBack()) { - if (log.isDebugEnabled()) { - log.debug("rollback transaction!"); - } - tx.rollback(); + + Transaction tx = ((TopiaContextImplementor) transaction).getHibernate().getTransaction(); + if (!tx.wasCommitted() && !tx.wasRolledBack()) { + if (log.isDebugEnabled()) { + log.debug("rollback transaction!"); } - transaction.closeContext(); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); + tx.rollback(); } + transaction.closeContext(); } } Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java 2013-07-11 16:51:18 UTC (rev 814) @@ -50,11 +50,7 @@ @Override public <E extends TopiaEntity> TopiaDAO<E> getDAO(TopiaContext tx, Class<E> type) { - try { - return EchoBaseDAOHelper.<E, TopiaDAO<E>>getDAO(tx, type); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } + return EchoBaseDAOHelper.<E, TopiaDAO<E>>getDAO(tx, type); } @Override Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaContexts.java 2013-07-11 16:51:18 UTC (rev 814) @@ -34,8 +34,6 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaNotFoundException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.util.RecursiveProperties; import java.io.File; @@ -188,17 +186,14 @@ * @return the new fresh root context */ private static TopiaContext newDb(Properties configuration) { - try { - if (log.isInfoEnabled()) { - log.info("Starts a db at : " + - configuration.get(TopiaContextFactory.CONFIG_URL)); - } - TopiaContext result = TopiaContextFactory.getContext(configuration); - return result; - } catch (TopiaNotFoundException e) { - throw new TopiaRuntimeException("Could not init db", e); + if (log.isInfoEnabled()) { + log.info("Starts a db at : " + + configuration.get(TopiaContextFactory.CONFIG_URL)); } + TopiaContext result = TopiaContextFactory.getContext(configuration); + + return result; } public static void reloadProperty(Properties properties, Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/services/EchoBaseServiceSupport.java 2013-07-11 16:51:18 UTC (rev 814) @@ -32,11 +32,9 @@ import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaNotFoundException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaId; import java.util.Date; import java.util.List; @@ -191,16 +189,6 @@ } } - protected <E extends TopiaEntity> TopiaDAO<E> getDAOFromId(String id) { - try { - return getDAO(TopiaId.getClassName(id)); - } catch (TopiaNotFoundException e) { - - throw new EchoBaseTechnicalException( - "Could not find class from id: " + id, e); - } - } - protected final <E extends TopiaEntity, D extends TopiaDAO<E>> D getDAO(Class<E> entityType, Class<D> daoType) { TopiaDAO<E> dao = getDAO(entityType); Preconditions.checkState(daoType.isAssignableFrom(dao.getClass())); Modified: trunk/echobase-domain/src/main/resources/echobase-internaldb.properties =================================================================== --- trunk/echobase-domain/src/main/resources/echobase-internaldb.properties 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/resources/echobase-internaldb.properties 2013-07-11 16:51:18 UTC (rev 814) @@ -37,6 +37,8 @@ hibernate.format_sql=false hibernate.use_sql_comments=false +topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.LegacyTopiaIdFactory + # Database migration configuration topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine topia.service.migration.callback=fr.ifremer.echobase.persistence.migration.internalDb.MigrationCallback Modified: trunk/echobase-domain/src/main/resources/echobase-workingdb.properties =================================================================== --- trunk/echobase-domain/src/main/resources/echobase-workingdb.properties 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-domain/src/main/resources/echobase-workingdb.properties 2013-07-11 16:51:18 UTC (rev 814) @@ -37,6 +37,8 @@ hibernate.format_sql=false hibernate.use_sql_comments=false +topia.persistence.topiaIdFactoryClassName=org.nuiton.topia.persistence.LegacyTopiaIdFactory + # Database migration configuration topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine topia.service.migration.callback=fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallback Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2013-07-11 16:51:18 UTC (rev 814) @@ -180,7 +180,7 @@ try { TopiaDAO<?> dao = getDAO(entityEnum.getContract()); TopiaEntity entity = dao.findByTopiaId(topiaId); - ExportModel<TopiaEntity> model = buildForLoad(tableMeta, TopiaEntity.TOPIA_ID, true); + ExportModel<TopiaEntity> model = buildForLoad(tableMeta, TopiaEntity.PROPERTY_TOPIA_ID, true); return loadRow(entity, model); } catch (TopiaException eee) { throw new EchoBaseTechnicalException("Could not obtain data", eee); @@ -275,7 +275,7 @@ throw new EchoBaseTechnicalException( "Could not found entity with id " + id); } else { - entityToSave = dao.create(TopiaEntity.TOPIA_ID, id); + entityToSave = dao.create(TopiaEntity.PROPERTY_TOPIA_ID, id); create = true; } } @@ -539,7 +539,7 @@ EntityCsvModel<EchoBaseEntityEnum, E> model = EntityCsvModel.newModel( getConfiguration().getCsvSeparator(), meta, - TopiaEntity.TOPIA_ID + TopiaEntity.PROPERTY_TOPIA_ID ); for (ColumnMeta columnMeta : meta) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportService.java 2013-07-11 16:51:18 UTC (rev 814) @@ -112,7 +112,7 @@ EntityCsvModel<EchoBaseEntityEnum, E> model = EntityCsvModel.newModel( getConfiguration().getCsvSeparator(), meta, - TopiaEntity.TOPIA_ID + TopiaEntity.PROPERTY_TOPIA_ID ); for (ColumnMeta columnMeta : meta) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/EchoBaseImportModelFactory.java 2013-07-11 16:51:18 UTC (rev 814) @@ -70,7 +70,7 @@ EntityCsvModel<EchoBaseEntityEnum, E> model = EntityCsvModel.newModel( csvSeparator, meta, - TopiaEntity.TOPIA_ID + TopiaEntity.PROPERTY_TOPIA_ID ); for (ColumnMeta columnMeta : meta) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/RemoveDataService.java 2013-07-11 16:51:18 UTC (rev 814) @@ -48,7 +48,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaIdFactory; import org.nuiton.util.TimeLog; import org.nuiton.util.decorator.Decorator; @@ -297,4 +301,16 @@ "Could not find out if id " + id + " exists.", e); } } + + protected <E extends TopiaEntity> TopiaDAO<E> getDAOFromId(String id) { + try { + TopiaIdFactory topiaIdFactory = ((TopiaContextImplementor) getTransaction()).getTopiaIdFactory(); + Class<E> className = topiaIdFactory.getClassName(id); + return getDAO(className); + } catch (TopiaNotFoundException e) { + + throw new EchoBaseTechnicalException( + "Could not find class from id: " + id, e); + } + } } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/FakeEchoBaseServiceContext.java 2013-07-11 16:51:18 UTC (rev 814) @@ -38,7 +38,6 @@ import org.junit.runner.Description; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.util.FileUtil; import java.io.File; @@ -156,11 +155,7 @@ protected void finished(Description description) { super.finished(description); if (!rootContext.isClosed()) { - try { - rootContext.closeContext(); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } + rootContext.closeContext(); } } @@ -168,11 +163,7 @@ @Override public TopiaContext getTransaction() { if (transaction == null) { - try { - transaction = rootContext.beginTransaction(); - } catch (TopiaException e) { - throw new TopiaRuntimeException(e); - } + transaction = rootContext.beginTransaction(); } return transaction; } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2013-07-11 16:51:18 UTC (rev 814) @@ -97,9 +97,10 @@ import org.junit.Assert; import org.junit.Before; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaId; +import org.nuiton.topia.persistence.TopiaIdFactory; import java.util.List; @@ -337,7 +338,9 @@ } private <E extends TopiaEntity> E getEntity(String id) throws TopiaException { - Class entityType = TopiaId.getClassName(id); + + TopiaIdFactory topiaIdFactory = ((TopiaContextImplementor) getTransaction()).getTopiaIdFactory(); + Class entityType = topiaIdFactory.getClassName(id); TopiaDAO<E> dao = getDAO(entityType); E entity = dao.findByTopiaId(id); return entity; @@ -347,7 +350,7 @@ // create voyage Voyage voyage = create(voyageDao, - TopiaEntity.TOPIA_ID, voyage1Id, + TopiaEntity.PROPERTY_TOPIA_ID, voyage1Id, Voyage.PROPERTY_MISSION, getFirstEntity(Mission.class), Voyage.PROPERTY_NAME, "voyage1", Voyage.PROPERTY_START_DATE, newDate(), @@ -360,7 +363,7 @@ // create transit Transit transit = create(transitDAO, - TopiaEntity.TOPIA_ID, transit1Id, + TopiaEntity.PROPERTY_TOPIA_ID, transit1Id, Transit.PROPERTY_START_TIME, newDate(), Transit.PROPERTY_END_TIME, newDate(), Transit.PROPERTY_START_LOCALITY, "transit1tartLocality", @@ -372,7 +375,7 @@ // create transect Transect transect = create(transectDAO, - TopiaEntity.TOPIA_ID, transect1Id, + TopiaEntity.PROPERTY_TOPIA_ID, transect1Id, Transect.PROPERTY_TITLE, "transect1Title", Transect.PROPERTY_VESSEL, getFirstEntity(Vessel.class), Transect.PROPERTY_STRATUM, "transect1Stratum" @@ -394,7 +397,7 @@ // create voyage Voyage voyage = create(voyageDao, - TopiaEntity.TOPIA_ID, voyage2Id, + TopiaEntity.PROPERTY_TOPIA_ID, voyage2Id, Voyage.PROPERTY_MISSION, getFirstEntity(Mission.class), Voyage.PROPERTY_NAME, "voyage2", Voyage.PROPERTY_START_DATE, newDate(), @@ -407,7 +410,7 @@ // create transit Transit transit = create(transitDAO, - TopiaEntity.TOPIA_ID, transit2Id, + TopiaEntity.PROPERTY_TOPIA_ID, transit2Id, Transit.PROPERTY_START_TIME, newDate(), Transit.PROPERTY_END_TIME, newDate(), Transit.PROPERTY_START_LOCALITY, "transit2StartLocality", @@ -419,7 +422,7 @@ // create transect Transect transect = create(transectDAO, - TopiaEntity.TOPIA_ID, transect2Id, + TopiaEntity.PROPERTY_TOPIA_ID, transect2Id, Transect.PROPERTY_TITLE, "transect2Title", Transect.PROPERTY_VESSEL, getFirstEntity(Vessel.class), Transect.PROPERTY_STRATUM, "transect2Stratum" @@ -443,7 +446,7 @@ // create transect Transect transect = create(transectDAO, - TopiaEntity.TOPIA_ID, transect1_2Id, + TopiaEntity.PROPERTY_TOPIA_ID, transect1_2Id, Transect.PROPERTY_TITLE, "transect12Title", Transect.PROPERTY_VESSEL, getFirstEntity(Vessel.class), Transect.PROPERTY_STRATUM, "transect12Stratum" @@ -467,7 +470,7 @@ // create transect Transect transect = create(transectDAO, - TopiaEntity.TOPIA_ID, transect2_2Id, + TopiaEntity.PROPERTY_TOPIA_ID, transect2_2Id, Transect.PROPERTY_TITLE, "transect22Title", Transect.PROPERTY_VESSEL, getFirstEntity(Vessel.class), Transect.PROPERTY_STRATUM, "transect22Stratum" @@ -491,7 +494,7 @@ // create operation Operation operation = create(operationDAO, - TopiaEntity.TOPIA_ID, operation1Id, + TopiaEntity.PROPERTY_TOPIA_ID, operation1Id, Operation.PROPERTY_ID, "operationId", Operation.PROPERTY_GEAR, getFirstEntity(Gear.class) ); @@ -533,7 +536,7 @@ // create totalSample Sample totalSample = create(sampleDAO, - TopiaEntity.TOPIA_ID, totalSample1Id, + TopiaEntity.PROPERTY_TOPIA_ID, totalSample1Id, Sample.PROPERTY_SAMPLE_TYPE, getFirstEntity(SampleType.class), Sample.PROPERTY_SPECIES_CATEGORY, getFirstEntity(SpeciesCategory.class), Sample.PROPERTY_NUMBER_SAMPLED, 10, @@ -550,7 +553,7 @@ // create subSample Sample subSample = create(sampleDAO, - TopiaEntity.TOPIA_ID, subSample1Id, + TopiaEntity.PROPERTY_TOPIA_ID, subSample1Id, Sample.PROPERTY_SAMPLE_TYPE, getFirstEntity(SampleType.class), Sample.PROPERTY_SPECIES_CATEGORY, getFirstEntity(SpeciesCategory.class), Sample.PROPERTY_NUMBER_SAMPLED, 10, @@ -566,7 +569,7 @@ // create biometrySample Sample biometrySample = create(sampleDAO, - TopiaEntity.TOPIA_ID, biometrySample1Id, + TopiaEntity.PROPERTY_TOPIA_ID, biometrySample1Id, Sample.PROPERTY_SAMPLE_TYPE, getFirstEntity(SampleType.class), Sample.PROPERTY_SPECIES_CATEGORY, getFirstEntity(SpeciesCategory.class), Sample.PROPERTY_NUMBER_SAMPLED, 10, @@ -596,7 +599,7 @@ // create data acquisition DataAcquisition dataAcquisition = create(dataAcquisitionDAO, - TopiaEntity.TOPIA_ID, dataAcquisition1Id, + TopiaEntity.PROPERTY_TOPIA_ID, dataAcquisition1Id, DataAcquisition.PROPERTY_ACOUSTIC_INSTRUMENT, getFirstEntity(AcousticInstrument.class)); transect.addDataAcquisition(dataAcquisition); @@ -608,7 +611,7 @@ // create esdu cell Cell esduCell = create(cellDAO, - TopiaEntity.TOPIA_ID, cellEsdu1Id, + TopiaEntity.PROPERTY_TOPIA_ID, cellEsdu1Id, Cell.PROPERTY_CELL_TYPE, getFirstEntity(CellType.class), Cell.PROPERTY_NAME, "cellEsdu1"); dataProcessing.addCell(esduCell); @@ -621,7 +624,7 @@ // create elementary cell Cell elementaryCell = create(cellDAO, - TopiaEntity.TOPIA_ID, cellElementary1Id, + TopiaEntity.PROPERTY_TOPIA_ID, cellElementary1Id, Cell.PROPERTY_CELL_TYPE, getFirstEntity(CellType.class), Cell.PROPERTY_NAME, "cellElementary1"); esduCell.addChilds(elementaryCell); @@ -647,13 +650,13 @@ // create echotype Echotype echotype = create(echotypeDAO, - TopiaEntity.TOPIA_ID, echotype1Id, + TopiaEntity.PROPERTY_TOPIA_ID, echotype1Id, Echotype.PROPERTY_NAME, "echotype1Name"); voyage.addEchotype(echotype); // create lengthAgeKey LengthAgeKey lengthAgeKey = create(lengthAgeKeyDAO, - TopiaEntity.TOPIA_ID, lengthAgeKey1Id, + TopiaEntity.PROPERTY_TOPIA_ID, lengthAgeKey1Id, LengthAgeKey.PROPERTY_AGE, 12, LengthAgeKey.PROPERTY_LENGTH, 12.5f, LengthAgeKey.PROPERTY_METADATA, "lengthAgeKeyMetadata1", @@ -665,7 +668,7 @@ // create lengthWeightKey LengthWeightKey lengthWeightKey = create(lengthWeightKeyDAO, - TopiaEntity.TOPIA_ID, lengthWeightKey1Id, + TopiaEntity.PROPERTY_TOPIA_ID, lengthWeightKey1Id, LengthWeightKey.PROPERTY_APARAMETER, 12.5f, LengthWeightKey.PROPERTY_BPARAMETER, 0.2f, LengthWeightKey.PROPERTY_METADATA, "lengthWeightMetadata1", @@ -690,7 +693,7 @@ Category category = create(categoryDAO); Result result = create(resultDAO, - TopiaEntity.TOPIA_ID, resultEsdu1Id, + TopiaEntity.PROPERTY_TOPIA_ID, resultEsdu1Id, Result.PROPERTY_CATEGORY, category, Result.PROPERTY_DATA_METADATA, getFirstEntity(DataMetadata.class), Result.PROPERTY_RESULT_VALUE, "resultValueEdsu1", @@ -713,7 +716,7 @@ // create region Cell region = create(cellDAO, - TopiaEntity.TOPIA_ID, cellRegion1Id, + TopiaEntity.PROPERTY_TOPIA_ID, cellRegion1Id, Cell.PROPERTY_CELL_TYPE, getFirstEntity(CellType.class), Cell.PROPERTY_NAME, "cellRegion1"); @@ -727,7 +730,7 @@ // create result (on region) Category category = create(categoryDAO); Result result = create(resultDAO, - TopiaEntity.TOPIA_ID, resultRegion1Id, + TopiaEntity.PROPERTY_TOPIA_ID, resultRegion1Id, Result.PROPERTY_CATEGORY, category, Result.PROPERTY_DATA_METADATA, getFirstEntity(DataMetadata.class), Result.PROPERTY_RESULT_VALUE, "resultValueRegion1", @@ -748,7 +751,7 @@ // create map Cell map = create(cellDAO, - TopiaEntity.TOPIA_ID, cellMap1Id, + TopiaEntity.PROPERTY_TOPIA_ID, cellMap1Id, Cell.PROPERTY_CELL_TYPE, getFirstEntity(CellType.class), Cell.PROPERTY_NAME, "cellMap1"); @@ -758,7 +761,7 @@ // create result (on map) Category category = create(categoryDAO); Result result = create(resultDAO, - TopiaEntity.TOPIA_ID, resultMap1Id, + TopiaEntity.PROPERTY_TOPIA_ID, resultMap1Id, Result.PROPERTY_CATEGORY, category, Result.PROPERTY_DATA_METADATA, getFirstEntity(DataMetadata.class), Result.PROPERTY_RESULT_VALUE, "resultValueMap1", Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2013-07-11 16:51:18 UTC (rev 814) @@ -44,8 +44,8 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntities; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaId; import org.nuiton.topia.persistence.csv.EntityCsvModel; import org.nuiton.topia.persistence.csv.in.CsvImportResult; import org.nuiton.topia.persistence.csv.in.ImportModelFactory; @@ -437,7 +437,7 @@ EchoBaseEntityEnum target = associationMeta.getTarget(); List<TopiaEntity> targetEntities = (List<TopiaEntity>) getEntities(target.getContract()); Map<String, TopiaEntity> targetsById = - Maps.uniqueIndex(targetEntities, TopiaId.GET_TOPIA_ID); + Maps.uniqueIndex(targetEntities, TopiaEntities.getTopiaIdFunction()); ImportModel<Map<String, Object>> model = modelFactory.buildForImport(associationMeta); @@ -447,10 +447,10 @@ List<E> sourceEntities = (List<E>) getEntities(sourceType.getContract()); Map<String, E> sourcesById = - Maps.uniqueIndex(sourceEntities, TopiaId.GET_TOPIA_ID); + Maps.uniqueIndex(sourceEntities, TopiaEntities.getTopiaIdFunction()); try { for (Map<String, Object> row : importer) { - String topiaId = (String) row.get(TopiaEntity.TOPIA_ID); + String topiaId = (String) row.get(TopiaEntity.PROPERTY_TOPIA_ID); E e = sourcesById.get(topiaId); String[] associations = (String[]) row.get("target"); List<TopiaEntity> associationEntities = Lists.newArrayList(); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2013-07-11 16:51:18 UTC (rev 814) @@ -45,7 +45,6 @@ import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.util.converter.ConverterUtil; import javax.servlet.ServletContext; @@ -140,17 +139,15 @@ ); // init database (and create minimal admin user if required) - try { - initInternalDatabase(applicationContext, serviceContext); - } catch (TopiaException e) { - throw new TopiaRuntimeException("Could not init internal db", e); - } + initInternalDatabase(applicationContext, serviceContext); + + // copy drivers if required try { copyDriverFiles(serviceContext); } catch (IOException e) { - throw new TopiaRuntimeException("Could not install drivers", e); + throw new TopiaException("Could not install drivers", e); } } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseInternalDbTransactionFilter.java 2013-07-11 16:51:18 UTC (rev 814) @@ -30,8 +30,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsStatics; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.web.filter.TopiaTransactionFilter; import javax.servlet.ServletRequest; @@ -56,20 +54,16 @@ } @Override - protected TopiaContext beginTransaction(ServletRequest request) throws TopiaRuntimeException { + protected TopiaContext beginTransaction(ServletRequest request) { EchoBaseApplicationContext applicationContext = EchoBaseActionSupport.getEchoBaseApplicationContext(); TopiaContext rootContext = applicationContext.getInternalRootContext(); - try { - TopiaContext transaction = rootContext.beginTransaction(); - if (log.isDebugEnabled()) { - log.debug("Starts a new echo transaction " + transaction); - } - return transaction; - } catch (TopiaException eee) { - throw new TopiaRuntimeException("Could not start transaction", eee); + TopiaContext transaction = rootContext.beginTransaction(); + if (log.isDebugEnabled()) { + log.debug("Starts a new echo transaction " + transaction); } + return transaction; } /** Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseWorkingDbTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseWorkingDbTransactionFilter.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseWorkingDbTransactionFilter.java 2013-07-11 16:51:18 UTC (rev 814) @@ -29,8 +29,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.struts2.StrutsStatics; import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.web.filter.TopiaTransactionFilter; import javax.servlet.FilterConfig; @@ -76,15 +74,11 @@ Preconditions.checkNotNull(userSession); TopiaContext rootContext = userSession.getWorkingDbRootContext(); Preconditions.checkNotNull(rootContext); - try { - TopiaContext transaction = rootContext.beginTransaction(); - if (log.isDebugEnabled()) { - log.debug("Starts a new working db transaction " + transaction); - } - return transaction; - } catch (TopiaException eee) { - throw new TopiaRuntimeException("Could not start transaction", eee); + TopiaContext transaction = rootContext.beginTransaction(); + if (log.isDebugEnabled()) { + log.debug("Starts a new working db transaction " + transaction); } + return transaction; } } \ No newline at end of file Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/SaveEntity.java 2013-07-11 16:51:18 UTC (rev 814) @@ -87,7 +87,7 @@ } } } - properties.put(TopiaEntity.TOPIA_ID, topiaId); + properties.put(TopiaEntity.PROPERTY_TOPIA_ID, topiaId); service.saveEntity(tableMeta, properties, Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-26 06:55:30 UTC (rev 813) +++ trunk/pom.xml 2013-07-11 16:51:18 UTC (rev 814) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>3.4.13-SNAPSHOT</version> </parent> <groupId>fr.ifremer</groupId> @@ -131,20 +131,20 @@  - <eugenePluginVersion>2.6.1</eugenePluginVersion> - <topiaVersion>2.8-rc-1</topiaVersion> - <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> - <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonWebVersion>1.12-beta-2</nuitonWebVersion> + <eugenePluginVersion>2.6.4-SNAPSHOT</eugenePluginVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> + <nuitonUtilsVersion>2.6.13-SNAPSHOT</nuitonUtilsVersion> + <nuitonI18nVersion>2.5.1</nuitonI18nVersion> + <nuitonWebVersion>1.14</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - <struts2Version>2.3.8</struts2Version> - <jqueryPluginVersion>3.5.0</jqueryPluginVersion> - <h2Version>1.3.171</h2Version> + <struts2Version>2.3.15</struts2Version> + <jqueryPluginVersion>3.6.0</jqueryPluginVersion> + <h2Version>1.3.172</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <slf4jVersion>1.7.5</slf4jVersion> - <jackcessVersion>1.2.10</jackcessVersion> + <jackcessVersion>1.2.13</jackcessVersion> - <hibernateVersion>4.2.0.Final</hibernateVersion> + <hibernateVersion>4.2.1.Final</hibernateVersion> <googleSearchEnabled>true</googleSearchEnabled> @@ -192,6 +192,13 @@ <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-config</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> <version>${nuitonUtilsVersion}</version> </dependency>

1 0