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 @@ <!-- libraries version --> - <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>