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

r243 - trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools
by tchemit＠users.forge.codelutin.com 06 Jan '12

06 Jan '12

Author: tchemit Date: 2012-01-06 17:18:37 +0100 (Fri, 06 Jan 2012) New Revision: 243 Url: http://forge.codelutin.com/repositories/revision/echobase/243 Log: use improve dbmeta api Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java 2012-01-06 16:18:08 UTC (rev 242) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java 2012-01-06 16:18:37 UTC (rev 243) @@ -98,7 +98,7 @@ Locale.getDefault(), topiaContextSupplier, configuration, - DbMeta.newDbMeta(EchoBaseEntityEnum.values()), + DbMeta.newDbMeta(), new EchoBaseServiceFactory() ); }

1 0

r242 - trunk/echobase-entities/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 06 Jan '12

06 Jan '12

Author: tchemit Date: 2012-01-06 17:18:08 +0100 (Fri, 06 Jan 2012) New Revision: 242 Url: http://forge.codelutin.com/repositories/revision/echobase/242 Log: i18n Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2012-01-06 15:57:36 UTC (rev 241) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2012-01-06 16:18:08 UTC (rev 242) @@ -59,7 +59,7 @@ echobase.common.depthStratum=depthStratum echobase.common.description=Description echobase.common.digitThreshold= -echobase.common.distributionStatement= +echobase.common.distributionStatement=distributionStatement echobase.common.echoBaseUser=Utilisateur echobase.common.echoBaseUserDTO= echobase.common.echosounderSoundSpeed= @@ -155,13 +155,13 @@ echobase.common.operationMetadataValue= echobase.common.operationType= echobase.common.operator= -echobase.common.organisationLevelAcknowledgements= -echobase.common.organisationReferences= +echobase.common.organisationLevelAcknowledgements=organisationLevelAcknowledgements +echobase.common.organisationReferences=Références organisation echobase.common.parentGear= echobase.common.password=Mot de passe echobase.common.percentAtAge= echobase.common.pingDutyCycle= -echobase.common.platform= +echobase.common.platform=Platform echobase.common.positive= echobase.common.precision= echobase.common.principalInvestigator=Chercheur

1 0

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

06 Jan '12

Author: tchemit Date: 2012-01-06 16:57:36 +0100 (Fri, 06 Jan 2012) New Revision: 241 Url: http://forge.codelutin.com/repositories/revision/echobase/241 Log: - fix saveEntity date diff - improve entityModificationLog Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java 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 2012-01-06 15:26:42 UTC (rev 240) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-01-06 15:57:36 UTC (rev 241) @@ -115,7 +115,6 @@ return rows; } - public <E extends TopiaEntity> List<E> getEntities(TableMeta tableMeta, Pager pager, String sidx, @@ -150,7 +149,6 @@ log.debug("pageCount= " + pager.getPageCount()); } - if (StringUtils.isNotEmpty(sidx)) { if (ascendantOrder) { query.addOrder(sidx); @@ -262,7 +260,7 @@ } } - if (!create) { + if (user != null && !create) { // monitor the existing bean monitor = new BeanMonitor(columnNames); @@ -273,16 +271,12 @@ if (user != null) { - // only create modification logs if user is specify - PropertyDiff[] propertyDiffs = monitor == null ? null : - monitor.getPropertyDiffs(); - createEntityModificationLog( tableMeta, messagePrefix, entityToSave, user, - propertyDiffs + monitor ); } return create; @@ -300,21 +294,30 @@ String messagePrefix, TopiaEntity entity, EchoBaseUser user, - PropertyDiff[] propertyDiffs) throws TopiaException { + BeanMonitor monitor + ) throws TopiaException { StringBuilder buffer; String topiaId = entity.getTopiaId(); - boolean create = propertyDiffs == null; + buffer = new StringBuilder(messagePrefix + "\n"); + if (monitor == null) { - buffer = new StringBuilder(messagePrefix + "\n"); - if (create) { + // no monitor, means this is a creation of an object buffer.append("Une entité a été crée d'identifiant ").append(topiaId); } else { + PropertyDiff[] propertyDiffs = monitor.getPropertyDiffs(); + int length = propertyDiffs.length; + if (length == 0) { + + // no property modified, do nothing + return; + } + if (length == 1) { buffer.append("Une propriété a été modifiée :"); } else { @@ -340,7 +343,7 @@ getLocale(), targetValue, null); } } - buffer.append(String.format("\n Propriété '%s', ancienne valeur : %s, nouvelle valeur : %s", + buffer.append(String.format("\n Propriété '%s', ancienne valeur : '%s', nouvelle valeur : '%s'", propertyName, sourceValue, targetValue Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-01-06 15:26:42 UTC (rev 240) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-01-06 15:57:36 UTC (rev 241) @@ -44,6 +44,7 @@ import org.nuiton.util.csv.ImportModel; import org.nuiton.util.csv.ImportToMap; +import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.io.InputStreamReader; @@ -103,7 +104,7 @@ false ); Reader reader = - new InputStreamReader(zipFile.getInputStream(value)); + new BufferedReader(new InputStreamReader(zipFile.getInputStream(value))); try { importFile(entryDef, reader, csvResult); } finally { @@ -119,7 +120,7 @@ getDAO(EntityModificationLog.class); dao.create( - EntityModificationLog.PROPERTY_ENTITY_TYPE, "import db", + EntityModificationLog.PROPERTY_ENTITY_TYPE, "Import db", EntityModificationLog.PROPERTY_ENTITY_ID, "Complete db", EntityModificationLog.PROPERTY_MODIFICATION_USER, user.getEmail(), EntityModificationLog.PROPERTY_MODIFICATION_DATE, newDate(), @@ -194,7 +195,8 @@ // load a association input AssociationMeta meta = (AssociationMeta) entry; - ImportModel<Map<String, Object>> model = importService.buildForImport(meta); + ImportModel<Map<String, Object>> model = + importService.buildForImport(meta); ImportToMap importer = MyImportToMap.newImport(model, reader); try { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java 2012-01-06 15:26:42 UTC (rev 240) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java 2012-01-06 15:57:36 UTC (rev 241) @@ -38,6 +38,7 @@ import org.nuiton.util.csv.ValueParser; import org.nuiton.util.csv.ValueParserFormatter; +import java.sql.Timestamp; import java.text.ParseException; import java.util.Collection; import java.util.Date; @@ -52,6 +53,20 @@ */ public class CsvModelUtil extends Common { + public static final ValueParserFormatter<Date> DAY_TIME_SECOND_WITH_TIMESTAMP = + new DateValue("dd/MM/yyyy HH:mm:ss") { + + @Override + public Date parse(String value) throws ParseException { + + Date parse = super.parse(value); + if (parse != null) { + parse = new Timestamp(parse.getTime()); + } + return parse; + } + }; + public static <E extends TopiaEntity> ForeignKeyValue<E> newForeignKeyValue(Class<E> type) { return new ForeignKeyValue<E>(type); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java 2012-01-06 15:26:42 UTC (rev 240) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java 2012-01-06 15:57:36 UTC (rev 241) @@ -152,7 +152,7 @@ modelBuilder.newColumnForImportExport( headerName, propertyName, - CsvModelUtil.DAY_TIME_SECOND + CsvModelUtil.DAY_TIME_SECOND_WITH_TIMESTAMP ); } else if (double.class.equals(type)) { modelBuilder.newColumnForImportExport(

1 0

r240 - trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta
by tchemit＠users.forge.codelutin.com 06 Jan '12

06 Jan '12

Author: tchemit Date: 2012-01-06 16:26:42 +0100 (Fri, 06 Jan 2012) New Revision: 240 Url: http://forge.codelutin.com/repositories/revision/echobase/240 Log: improve dbMeta api Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java 2012-01-05 11:04:49 UTC (rev 239) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/meta/DbMeta.java 2012-01-06 15:26:42 UTC (rev 240) @@ -26,10 +26,12 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import com.google.common.collect.Sets; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import java.util.Iterator; import java.util.List; +import java.util.Set; /** * Define metas about a db. @@ -39,23 +41,20 @@ */ public class DbMeta implements Iterable<TableMeta> { - protected List<TableMeta> tables; + /** All metas of the db. */ + protected final List<TableMeta> tables; - protected final EchoBaseEntityEnum[] entityEnums; + /** All types that we do not want to edit. */ + protected final Set<EchoBaseEntityEnum> nonEditableTypes = Sets.immutableEnumSet( + EchoBaseEntityEnum.EchoBaseUser, + EchoBaseEntityEnum.EntityModificationLog, + EchoBaseEntityEnum.ExportQuery + ); public static DbMeta newDbMeta() { - List<EchoBaseEntityEnum> entityEnums = - Lists.newArrayList(EchoBaseEntityEnum.values()); - entityEnums.remove(EchoBaseEntityEnum.EchoBaseUser); - entityEnums.remove(EchoBaseEntityEnum.EntityModificationLog); - entityEnums.remove(EchoBaseEntityEnum.ExportQuery); - return newDbMeta(entityEnums.toArray(new EchoBaseEntityEnum[entityEnums.size()])); + return new DbMeta(EchoBaseEntityEnum.values()); } - public static DbMeta newDbMeta(EchoBaseEntityEnum[] entityEnums) { - return new DbMeta(entityEnums); - } - public List<String> getTableNames() { List<String> result = Lists.newArrayList(); for (TableMeta tableMeta : getTables()) { @@ -65,21 +64,14 @@ } public List<TableMeta> getTables() { - if (tables == null) { - tables = Lists.newArrayList(); - for (EchoBaseEntityEnum entityEnum : entityEnums) { - TableMeta tableMeta = TableMeta.newMeta(entityEnum); - tables.add(tableMeta); - } - } return tables; } - public TableMeta getTable(EchoBaseEntityEnum tableName) { - Preconditions.checkNotNull(tableName); + public TableMeta getTable(EchoBaseEntityEnum entityType) { + Preconditions.checkNotNull(entityType); TableMeta result = null; for (TableMeta tableMeta : getTables()) { - if (tableName.equals(tableMeta.getSource())) { + if (entityType.equals(tableMeta.getSource())) { result = tableMeta; break; } @@ -92,7 +84,15 @@ return getTables().iterator(); } - protected DbMeta(EchoBaseEntityEnum[] entityEnums) { - this.entityEnums = entityEnums; + protected DbMeta(EchoBaseEntityEnum[] entityTypes) { + tables = Lists.newArrayList(); + for (EchoBaseEntityEnum entityEnum : entityTypes) { + TableMeta tableMeta = TableMeta.newMeta(entityEnum); + tables.add(tableMeta); + } } + + public boolean isEditable(TableMeta meta) { + return !nonEditableTypes.contains(meta.getSource()); + } }

1 0

r239 - in trunk/echobase-ui: . src/main/env/dev/resources src/main/env/prod/resources src/main/webapp/WEB-INF
by tchemit＠users.forge.codelutin.com 05 Jan '12

05 Jan '12

Author: tchemit Date: 2012-01-05 12:04:49 +0100 (Thu, 05 Jan 2012) New Revision: 239 Url: http://forge.codelutin.com/repositories/revision/echobase/239 Log: fix log configuration Added: trunk/echobase-ui/src/main/env/dev/resources/log4j.xml trunk/echobase-ui/src/main/env/prod/resources/log4j.xml Removed: trunk/echobase-ui/src/main/env/dev/resources/log4j.properties trunk/echobase-ui/src/main/env/prod/resources/log4j.properties trunk/echobase-ui/src/main/webapp/WEB-INF/log4j.xml Modified: trunk/echobase-ui/pom.xml Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-01-05 10:42:31 UTC (rev 238) +++ trunk/echobase-ui/pom.xml 2012-01-05 11:04:49 UTC (rev 239) @@ -255,6 +255,7 @@ <directory>src/main/env/${env}/resources</directory> <includes> <include>*.properties</include> + <include>*.xml</include> </includes> </resource> </resources> @@ -403,7 +404,7 @@ <systemProperties> <systemProperty> <name>echobase.log.dir</name> - <value>/var/local/echobase/log</value> + <value>/var/local/echobase/logs</value> </systemProperty> </systemProperties> </configuration> Deleted: trunk/echobase-ui/src/main/env/dev/resources/log4j.properties =================================================================== --- trunk/echobase-ui/src/main/env/dev/resources/log4j.properties 2012-01-05 10:42:31 UTC (rev 238) +++ trunk/echobase-ui/src/main/env/dev/resources/log4j.properties 2012-01-05 11:04:49 UTC (rev 239) @@ -1,38 +0,0 @@ -### -# #%L -# EchoBase :: UI -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2011 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% -### -# Global logging configuration -log4j.rootLogger=WARN, stdout - -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%t] %d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n - -# package level -log4j.logger.fr.ifremer.echobase=INFO -log4j.logger.org.nuiton=WARN -log4j.logger.org.nuiton.topia.migration=INFO -log4j.logger.org.nuiton.topia.replication=INFO -log4j.logger.com.opensymphony.xwork2.util.logging.commons.CommonsLogger=ERROR -log4j.logger.org.apache.struts2.util.TokenHelper=ERROR Copied: trunk/echobase-ui/src/main/env/dev/resources/log4j.xml (from rev 238, trunk/echobase-ui/src/main/webapp/WEB-INF/log4j.xml) =================================================================== --- trunk/echobase-ui/src/main/env/dev/resources/log4j.xml (rev 0) +++ trunk/echobase-ui/src/main/env/dev/resources/log4j.xml 2012-01-05 11:04:49 UTC (rev 239) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE log4j:configuration SYSTEM + "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/…"> +<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'> + +  +  +  + +  + <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> + <param name="File" value="${echobase.log.dir}/echobase.log"/> + <param name="Append" value="false"/> + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> + </layout> + </appender> + +  +  +  + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> +  + <param name="ConversionPattern" + value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + + <logger name="org.nuiton"> + <level value="WARN"/> + </logger> + + <root> + <priority value="INFO"/> + <appender-ref ref="FILE"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Deleted: trunk/echobase-ui/src/main/env/prod/resources/log4j.properties =================================================================== --- trunk/echobase-ui/src/main/env/prod/resources/log4j.properties 2012-01-05 10:42:31 UTC (rev 238) +++ trunk/echobase-ui/src/main/env/prod/resources/log4j.properties 2012-01-05 11:04:49 UTC (rev 239) @@ -1,36 +0,0 @@ -### -# #%L -# EchoBase :: UI -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2011 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% -### -# Global logging configuration -log4j.rootLogger=ERROR, stdout - -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n - -log4j.logger.fr.ifremer.echobase=INFO -log4j.logger.org.nuiton.topia.migration=INFO -log4j.logger.org.nuiton.topia.replication=INFO -log4j.logger.com.opensymphony.xwork2.util.logging.commons.CommonsLogger=ERROR -log4j.logger.org.apache.struts2.util.TokenHelper=ERROR Added: trunk/echobase-ui/src/main/env/prod/resources/log4j.xml =================================================================== --- trunk/echobase-ui/src/main/env/prod/resources/log4j.xml (rev 0) +++ trunk/echobase-ui/src/main/env/prod/resources/log4j.xml 2012-01-05 11:04:49 UTC (rev 239) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE log4j:configuration SYSTEM + "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/…"> +<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/' + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jakarta.apache.org/log4j/ "> + +  +  +  + +  + <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> + <param name="File" value="${echobase.log.dir}/echobase.log"/> + <param name="Append" value="false"/> + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> + </layout> + </appender> + +  +  +  + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> +  + <param name="ConversionPattern" + value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + + <logger name="org.nuiton"> + <level value="WARN"/> + </logger> + + <logger name="fr.ifremer"> + <level value="INFO"/> + </logger> + + <root> + <priority value="ERROR"/> + <appender-ref ref="FILE"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Deleted: trunk/echobase-ui/src/main/webapp/WEB-INF/log4j.xml =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/log4j.xml 2012-01-05 10:42:31 UTC (rev 238) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/log4j.xml 2012-01-05 11:04:49 UTC (rev 239) @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<!DOCTYPE log4j:configuration SYSTEM "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/…"> -<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'> - -  -  -  - -  - <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> - <param name="File" value="${echobase.log.dir}/echobase.log"/> - <param name="Append" value="false"/> - <param name="DatePattern" value="'.'yyyy-MM-dd"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> - </layout> - </appender> - -  -  -  - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> -  - <param name="ConversionPattern" - value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - - <logger name="org.apache.shiro.realm.AuthorizingRealm"> - <level value="WARN"/> - </logger> - - <root> - <priority value="INFO"/> - <appender-ref ref="FILE"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration>

1 0

r238 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/main/java/fr/ifremer/echobase/services/configurations echobase-services/src/main/java/fr/ifremer/echobase/services/csv echobase-services/src/main/java/fr/ifremer/echobase/services/models echobase-tools/src/main/java/fr/ifremer/echobase/tools echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders echobase-ui echobase-ui/src/main/java/fr/ifremer/echobase/ui echobase-ui/src/main/java/f
by tchemit＠users.forge.codelutin.com 05 Jan '12

05 Jan '12

Author: tchemit Date: 2012-01-05 11:42:31 +0100 (Thu, 05 Jan 2012) New Revision: 238 Url: http://forge.codelutin.com/repositories/revision/echobase/238 Log: last directories renames Added: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractEchobaseActionConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ExportDbConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDataConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDbConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java trunk/echobase-ui/src/main/webapp/WEB-INF/log4j.xml Removed: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbConfiguration.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/CsvModelUtil.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityAssociationExportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityAssociationImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityCsvModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/ExportQueryCsvModel.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportService.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/EchoBaseDbCreator.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AgeCategoryLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellMethodLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellTypeLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataQualityLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataTypeLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.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/GearMetadataLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationEventLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumTypeLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SpeciesLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/StrataLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoader.java trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java trunk/echobase-ui/pom.xml trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/Import.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java 2012-01-05 10:42:31 UTC (rev 238) @@ -1,104 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services; - -import org.nuiton.util.StringUtil; - -import java.io.IOException; -import java.io.Serializable; - -/** - * Abstract long action configuration. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public abstract class AbstractEchobaseActionConfiguration implements Serializable { - - private static final long serialVersionUID = 1L; - - private int nbSteps; - - private float stepIncrement; - - private float progression; - - private long startTime; - private long endTime; - - public final int getNbSteps() { - return nbSteps; - } - - public final float getProgression() { - return progression; - } - - public final void setProgression(float progression) { - this.progression = progression; - } - - public final void incrementsProgression() { - setProgression(progression + stepIncrement); - } - - public final void setNbSteps(int nbSteps) { - - this.nbSteps = nbSteps; - stepIncrement = 100f / nbSteps; - } - - public final long getStartTime() { - return startTime; - } - - public final void setStartTime(long startTime) { - this.startTime = startTime; - } - - public final long getEndTime() { - return endTime; - } - - public final void setEndTime(long endTime) { - this.endTime = endTime; - } - - public String getActionTime() { - long sTime = getStartTime(); - long eTime = getEndTime(); - return StringUtil.convertTime(eTime - sTime); - } - - public void beginAction() { - setStartTime(System.nanoTime()); - } - - public void endAction() { - setEndTime(System.nanoTime()); - } - - public void destroy() throws IOException { - } -} 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 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-01-05 10:42:31 UTC (rev 238) @@ -32,8 +32,8 @@ import fr.ifremer.echobase.entities.meta.ColumnMeta; import fr.ifremer.echobase.entities.meta.DbMeta; import fr.ifremer.echobase.entities.meta.TableMeta; -import fr.ifremer.echobase.services.models.CsvModelUtil; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.CsvModelUtil; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java 2012-01-05 10:42:31 UTC (rev 238) @@ -1,102 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 - 2012 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services; - -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.IOException; - -/** - * Configuration of a embedded application creation. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class EmbeddedApplicationConfiguration extends AbstractEchobaseActionConfiguration { - - private static final long serialVersionUID = 1L; - - /** File name of the embedded application archive (without the zip extension). */ - private String fileName; - - /** Working directory where to generate the archive of embedded application. */ - private File workingDirectory; - - /** Embedded application archive file. */ - private File embeddedApplicationFile; - - /** Location of the war file to push in embedded application. */ - private File warLocation; - - /** Ids of voyages to push in embedded application (with all their datas). */ - private String[] voyageIds; - - public String getFileName() { - return fileName; - } - - public void setFileName(String fileName) { - this.fileName = fileName; - } - - public File getWorkingDirectory() { - return workingDirectory; - } - - public void setWorkingDirectory(File workingDirectory) { - this.workingDirectory = workingDirectory; - } - - public File getEmbeddedApplicationFile() { - return embeddedApplicationFile; - } - - public void setEmbeddedApplicationFile(File embeddedApplicationFile) { - this.embeddedApplicationFile = embeddedApplicationFile; - } - - public String[] getVoyageIds() { - return voyageIds; - } - - public void setVoyageIds(String[] voyageIds) { - this.voyageIds = voyageIds; - } - - public File getWarLocation() { - return warLocation; - } - - public void setWarLocation(File warLocation) { - this.warLocation = warLocation; - } - - @Override - public void destroy() throws IOException { - if (workingDirectory != null) { - FileUtils.deleteDirectory(workingDirectory); - } - } -} \ No newline at end of file Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-01-05 10:42:31 UTC (rev 238) @@ -33,6 +33,7 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EntitiesUtil; import fr.ifremer.echobase.entities.ExportQuery; +import fr.ifremer.echobase.services.configurations.EmbeddedApplicationConfiguration; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbConfiguration.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbConfiguration.java 2012-01-05 10:42:31 UTC (rev 238) @@ -1,78 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services; - -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.IOException; - -/** - * Configuration of a complete db export. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class ExportDbConfiguration extends AbstractEchobaseActionConfiguration { - - private static final long serialVersionUID = 1L; - - private String fileName; - - private File workingDirectory; - - private File exportFile; - - public String getFileName() { - return fileName; - } - - public void setFileName(String fileName) { - this.fileName = fileName; - } - - public File getWorkingDirectory() { - return workingDirectory; - } - - public void setWorkingDirectory(File workingDirectory) { - this.workingDirectory = workingDirectory; - } - - public File getExportFile() { - return exportFile; - } - - public void setExportFile(File exportFile) { - this.exportFile = exportFile; - } - - @Override - public void destroy() throws IOException { - if (workingDirectory != null) { - FileUtils.deleteDirectory(workingDirectory); - } - } - -} \ No newline at end of file Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-01-05 10:42:31 UTC (rev 238) @@ -28,6 +28,7 @@ import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.MetaFilenameAware; import fr.ifremer.echobase.entities.meta.TableMeta; +import fr.ifremer.echobase.services.configurations.ExportDbConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java 2012-01-05 10:42:31 UTC (rev 238) @@ -27,7 +27,7 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.ExportQuery; import fr.ifremer.echobase.entities.ExportQueryImpl; -import fr.ifremer.echobase.services.models.ExportQueryCsvModel; +import fr.ifremer.echobase.services.csv.ExportQueryCsvModel; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2012-01-05 10:42:31 UTC (rev 238) @@ -27,8 +27,8 @@ import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.ColumnMeta; import fr.ifremer.echobase.entities.meta.TableMeta; -import fr.ifremer.echobase.services.models.EntityAssociationExportModel; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityAssociationExportModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataConfiguration.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataConfiguration.java 2012-01-05 10:42:31 UTC (rev 238) @@ -1,140 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services; - -import fr.ifremer.echobase.InputFile; -import fr.ifremer.echobase.entities.references.Mission; -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.IOException; -import java.util.Locale; - -import static org.nuiton.i18n.I18n.l_; - -/** - * Configuration of an import data action. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class ImportDataConfiguration extends AbstractEchobaseActionConfiguration { - - private static final long serialVersionUID = 1L; - - /** Mission used for the import (may not be in db if needed to be created). */ - protected Mission mission; - - protected ImportDataMode importDataMode; - - protected File workingDirectory; - - protected InputFile acousticFile; - - protected InputFile captureFile; - - protected InputFile lectureAgeGenFile; - - protected InputFile eventsFile; - - protected InputFile typeEchoSpeciesFile; - - public ImportDataConfiguration(Locale locale) { - acousticFile = InputFile.newFile( - l_(locale, "echobase.common.acousticImport")); - captureFile = InputFile.newFile( - l_(locale, "echobase.common.captureImport")); - lectureAgeGenFile = InputFile.newFile( - l_(locale, "echobase.common.lectureAgeGenImport")); - eventsFile = InputFile.newFile( - l_(locale, "echobase.common.eventsImport")); - typeEchoSpeciesFile = InputFile.newFile( - l_(locale, "echobase.common.typeEchoSpeciesImport")); - } - - public ImportDataMode getImportDataMode() { - return importDataMode; - } - - public File getWorkingDirectory() { - return workingDirectory; - } - - public Mission getMission() { - return mission; - } - - public InputFile getAcousticFile() { - return acousticFile; - } - - public InputFile getCaptureFile() { - return captureFile; - } - - public InputFile getLectureAgeGenFile() { - return lectureAgeGenFile; - } - - public InputFile getEventsFile() { - return eventsFile; - } - - public InputFile getTypeEchoSpeciesFile() { - return typeEchoSpeciesFile; - } - - public void setImportDataMode(ImportDataMode importDataMode) { - this.importDataMode = importDataMode; - } - - public void setWorkingDirectory(File workingDirectory) { - this.workingDirectory = workingDirectory; - } - - public void setMission(Mission mission) { - this.mission = mission; - } - - public void computeSteps() { - int nbSteps = 0; - switch (importDataMode) { - case ALL: - nbSteps = 5; - break; - case ACOUSTIC: - nbSteps = 1; - break; - default: - } - setNbSteps(nbSteps); - } - - @Override - public void destroy() throws IOException { - if (workingDirectory != null) { - FileUtils.deleteDirectory(workingDirectory); - } - } -} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataService.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataService.java 2012-01-05 10:42:31 UTC (rev 238) @@ -27,6 +27,7 @@ import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.InputFile; import fr.ifremer.echobase.entities.references.Mission; +import fr.ifremer.echobase.services.configurations.ImportDataConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbConfiguration.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbConfiguration.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbConfiguration.java 2012-01-05 10:42:31 UTC (rev 238) @@ -1,73 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services; - -import fr.ifremer.echobase.InputFile; -import org.apache.commons.io.FileUtils; - -import java.io.File; -import java.io.IOException; -import java.util.Locale; - -import static org.nuiton.i18n.I18n.l_; - -/** - * Configuration of a import db operation. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class ImportDbConfiguration extends AbstractEchobaseActionConfiguration { - - private static final long serialVersionUID = 1L; - - protected File workingDirectory; - - protected InputFile input; - - public ImportDbConfiguration(Locale locale) { - input = InputFile.newFile( - l_(locale, "echobase.common.importDbFile")); - } - - public File getWorkingDirectory() { - return workingDirectory; - } - - public InputFile getInput() { - return input; - } - - public void setWorkingDirectory(File workingDirectory) { - this.workingDirectory = workingDirectory; - } - - @Override - public void destroy() throws IOException { - if (workingDirectory != null) { - FileUtils.deleteDirectory(workingDirectory); - } - } - -} Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-01-05 10:42:31 UTC (rev 238) @@ -32,6 +32,7 @@ import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.MetaFilenameAware; import fr.ifremer.echobase.entities.meta.TableMeta; +import fr.ifremer.echobase.services.configurations.ImportDbConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportService.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportService.java 2012-01-05 10:42:31 UTC (rev 238) @@ -29,8 +29,8 @@ import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.ColumnMeta; import fr.ifremer.echobase.entities.meta.TableMeta; -import fr.ifremer.echobase.services.models.EntityAssociationImportModel; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityAssociationImportModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractEchobaseActionConfiguration.java (from rev 235, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/AbstractEchobaseActionConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractEchobaseActionConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractEchobaseActionConfiguration.java 2012-01-05 10:42:31 UTC (rev 238) @@ -0,0 +1,104 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.configurations; + +import org.nuiton.util.StringUtil; + +import java.io.IOException; +import java.io.Serializable; + +/** + * Abstract long action configuration. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public abstract class AbstractEchobaseActionConfiguration implements Serializable { + + private static final long serialVersionUID = 1L; + + private int nbSteps; + + private float stepIncrement; + + private float progression; + + private long startTime; + private long endTime; + + public final int getNbSteps() { + return nbSteps; + } + + public final float getProgression() { + return progression; + } + + public final void setProgression(float progression) { + this.progression = progression; + } + + public final void incrementsProgression() { + setProgression(progression + stepIncrement); + } + + public final void setNbSteps(int nbSteps) { + + this.nbSteps = nbSteps; + stepIncrement = 100f / nbSteps; + } + + public final long getStartTime() { + return startTime; + } + + public final void setStartTime(long startTime) { + this.startTime = startTime; + } + + public final long getEndTime() { + return endTime; + } + + public final void setEndTime(long endTime) { + this.endTime = endTime; + } + + public String getActionTime() { + long sTime = getStartTime(); + long eTime = getEndTime(); + return StringUtil.convertTime(eTime - sTime); + } + + public void beginAction() { + setStartTime(System.nanoTime()); + } + + public void endAction() { + setEndTime(System.nanoTime()); + } + + public void destroy() throws IOException { + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/AbstractEchobaseActionConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java (from rev 235, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java 2012-01-05 10:42:31 UTC (rev 238) @@ -0,0 +1,102 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.configurations; + +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.io.IOException; + +/** + * Configuration of a embedded application creation. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class EmbeddedApplicationConfiguration extends AbstractEchobaseActionConfiguration { + + private static final long serialVersionUID = 1L; + + /** File name of the embedded application archive (without the zip extension). */ + private String fileName; + + /** Working directory where to generate the archive of embedded application. */ + private File workingDirectory; + + /** Embedded application archive file. */ + private File embeddedApplicationFile; + + /** Location of the war file to push in embedded application. */ + private File warLocation; + + /** Ids of voyages to push in embedded application (with all their datas). */ + private String[] voyageIds; + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public File getWorkingDirectory() { + return workingDirectory; + } + + public void setWorkingDirectory(File workingDirectory) { + this.workingDirectory = workingDirectory; + } + + public File getEmbeddedApplicationFile() { + return embeddedApplicationFile; + } + + public void setEmbeddedApplicationFile(File embeddedApplicationFile) { + this.embeddedApplicationFile = embeddedApplicationFile; + } + + public String[] getVoyageIds() { + return voyageIds; + } + + public void setVoyageIds(String[] voyageIds) { + this.voyageIds = voyageIds; + } + + public File getWarLocation() { + return warLocation; + } + + public void setWarLocation(File warLocation) { + this.warLocation = warLocation; + } + + @Override + public void destroy() throws IOException { + if (workingDirectory != null) { + FileUtils.deleteDirectory(workingDirectory); + } + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/EmbeddedApplicationConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ExportDbConfiguration.java (from rev 235, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ExportDbConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ExportDbConfiguration.java 2012-01-05 10:42:31 UTC (rev 238) @@ -0,0 +1,78 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.configurations; + +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.io.IOException; + +/** + * Configuration of a complete db export. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class ExportDbConfiguration extends AbstractEchobaseActionConfiguration { + + private static final long serialVersionUID = 1L; + + private String fileName; + + private File workingDirectory; + + private File exportFile; + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public File getWorkingDirectory() { + return workingDirectory; + } + + public void setWorkingDirectory(File workingDirectory) { + this.workingDirectory = workingDirectory; + } + + public File getExportFile() { + return exportFile; + } + + public void setExportFile(File exportFile) { + this.exportFile = exportFile; + } + + @Override + public void destroy() throws IOException { + if (workingDirectory != null) { + FileUtils.deleteDirectory(workingDirectory); + } + } + +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ExportDbConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDataConfiguration.java (from rev 235, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDataConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDataConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDataConfiguration.java 2012-01-05 10:42:31 UTC (rev 238) @@ -0,0 +1,141 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.configurations; + +import fr.ifremer.echobase.InputFile; +import fr.ifremer.echobase.entities.references.Mission; +import fr.ifremer.echobase.services.ImportDataMode; +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.io.IOException; +import java.util.Locale; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Configuration of an import data action. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class ImportDataConfiguration extends AbstractEchobaseActionConfiguration { + + private static final long serialVersionUID = 1L; + + /** Mission used for the import (may not be in db if needed to be created). */ + protected Mission mission; + + protected ImportDataMode importDataMode; + + protected File workingDirectory; + + protected InputFile acousticFile; + + protected InputFile captureFile; + + protected InputFile lectureAgeGenFile; + + protected InputFile eventsFile; + + protected InputFile typeEchoSpeciesFile; + + public ImportDataConfiguration(Locale locale) { + acousticFile = InputFile.newFile( + l_(locale, "echobase.common.acousticImport")); + captureFile = InputFile.newFile( + l_(locale, "echobase.common.captureImport")); + lectureAgeGenFile = InputFile.newFile( + l_(locale, "echobase.common.lectureAgeGenImport")); + eventsFile = InputFile.newFile( + l_(locale, "echobase.common.eventsImport")); + typeEchoSpeciesFile = InputFile.newFile( + l_(locale, "echobase.common.typeEchoSpeciesImport")); + } + + public ImportDataMode getImportDataMode() { + return importDataMode; + } + + public File getWorkingDirectory() { + return workingDirectory; + } + + public Mission getMission() { + return mission; + } + + public InputFile getAcousticFile() { + return acousticFile; + } + + public InputFile getCaptureFile() { + return captureFile; + } + + public InputFile getLectureAgeGenFile() { + return lectureAgeGenFile; + } + + public InputFile getEventsFile() { + return eventsFile; + } + + public InputFile getTypeEchoSpeciesFile() { + return typeEchoSpeciesFile; + } + + public void setImportDataMode(ImportDataMode importDataMode) { + this.importDataMode = importDataMode; + } + + public void setWorkingDirectory(File workingDirectory) { + this.workingDirectory = workingDirectory; + } + + public void setMission(Mission mission) { + this.mission = mission; + } + + public void computeSteps() { + int nbSteps = 0; + switch (importDataMode) { + case ALL: + nbSteps = 5; + break; + case ACOUSTIC: + nbSteps = 1; + break; + default: + } + setNbSteps(nbSteps); + } + + @Override + public void destroy() throws IOException { + if (workingDirectory != null) { + FileUtils.deleteDirectory(workingDirectory); + } + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDataConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDbConfiguration.java (from rev 235, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbConfiguration.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDbConfiguration.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDbConfiguration.java 2012-01-05 10:42:31 UTC (rev 238) @@ -0,0 +1,73 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.configurations; + +import fr.ifremer.echobase.InputFile; +import org.apache.commons.io.FileUtils; + +import java.io.File; +import java.io.IOException; +import java.util.Locale; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Configuration of a import db operation. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class ImportDbConfiguration extends AbstractEchobaseActionConfiguration { + + private static final long serialVersionUID = 1L; + + protected File workingDirectory; + + protected InputFile input; + + public ImportDbConfiguration(Locale locale) { + input = InputFile.newFile( + l_(locale, "echobase.common.importDbFile")); + } + + public File getWorkingDirectory() { + return workingDirectory; + } + + public InputFile getInput() { + return input; + } + + public void setWorkingDirectory(File workingDirectory) { + this.workingDirectory = workingDirectory; + } + + @Override + public void destroy() throws IOException { + if (workingDirectory != null) { + FileUtils.deleteDirectory(workingDirectory); + } + } + +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/configurations/ImportDbConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java (from rev 235, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/CsvModelUtil.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java 2012-01-05 10:42:31 UTC (rev 238) @@ -0,0 +1,263 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.csv; + +import com.google.common.base.Function; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import fr.ifremer.echobase.EchoBaseFunctions; +import fr.ifremer.echobase.EchoBaseTechnicalException; +import fr.ifremer.echobase.services.DecoratorService; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.StringUtil; +import org.nuiton.util.csv.Common; +import org.nuiton.util.csv.ValueFormatter; +import org.nuiton.util.csv.ValueParser; +import org.nuiton.util.csv.ValueParserFormatter; + +import java.text.ParseException; +import java.util.Collection; +import java.util.Date; +import java.util.Locale; +import java.util.Map; + +/** + * Usefull class to build csv import-export models. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class CsvModelUtil extends Common { + + public static <E extends TopiaEntity> ForeignKeyValue<E> newForeignKeyValue(Class<E> type) { + return new ForeignKeyValue<E>(type); + } + + public static <E extends TopiaEntity> ForeignKeyValue<E> newForeignKeyValue(Class<E> type, Collection<E> entitites) { + Map<String, E> universe = Maps.uniqueIndex(entitites, EchoBaseFunctions.TO_TOPIAID); + return newForeignKeyValue(type, universe); + } + + public static <E extends TopiaEntity> ForeignKeyValue<E> newForeignKeyValue(Class<E> type, Map<String, E> universe) { + return new ForeignKeyValue<E>(type, universe); + } + + public static <E extends TopiaEntity> ForeignKeyValue<E> newForeignKeyValue(Class<E> type, Collection<E> entitites, Function<E, String> transform) { + Map<String, E> universe = Maps.uniqueIndex(entitites, transform); + return new ForeignKeyValue<E>(type, universe); + } + + public static <E extends TopiaEntity> ForeignKeyDecoratedValue<E> newForeignKeyDecoratedValue(Class<E> entityType, + DecoratorService decoratorService, Locale locale) { + return new ForeignKeyDecoratedValue<E>(entityType, decoratorService, locale); + } + + public static <E extends TopiaEntity> ValueFormatter<Collection<E>> newAssociationValueFormatter() { + return new AssociationValueParserFormatter<E>(null, null); + } + + public static <E extends TopiaEntity> AssociationValueParserFormatter<E> newAssociationValueParserFormatter(Class<E> entityType, + Map<String, E> universe) { + return new AssociationValueParserFormatter<E>(entityType, universe); + } + + public static final ValueParser<Date> IMPORT_DAY = new DateValue("dd/MM/yy"); + + public static class BooleanParserFormatter extends NullableParserFormatter<Boolean> { + + public BooleanParserFormatter(Boolean defaultValue, boolean nullAllowed) { + super(defaultValue, nullAllowed); + } + + @Override + public String format(Boolean bool) { + String value; + if (bool == null) { + if (nullAllowed) { + value = "?"; + } else { + throw new IllegalArgumentException(); + } + } else if (bool) { + value = "Y"; + } else { + value = "N"; + } + return value; + } + + @Override + protected Boolean parseNoneEmptyValue(String value) { + Boolean result; + if ("?".equals(value)) { + result = null; + } else if ("Y".equals(value)) { + result = true; + } else if ("N".equals(value)) { + result = false; + } else { + result = Boolean.parseBoolean(value); + } + return result; + } + } + + public static final ValueParser<Boolean> INT_TO_BOOLEAN_PARSER = new ValueParser<Boolean>() { + + @Override + public Boolean parse(String value) { + return "1".equals(value); + } + }; + + public static class AssociationValueParserFormatter<E extends TopiaEntity> implements ValueParserFormatter<Collection<E>> { + + protected final Class<E> entityType; + + protected final Map<String, E> universe; + + public AssociationValueParserFormatter( + Class<E> entityType, + Map<String, E> universe) { + this.entityType = entityType; + this.universe = universe; + } + + @Override + public Collection<E> parse(String value) throws ParseException { + Collection<E> result = Lists.newArrayList(); + if (StringUtils.isNotBlank(value)) { + + String[] ids = value.split("\\|"); + for (String id : ids) { + E association = universe.get(id); + association.setTopiaId(id); + result.add(association); + } + } + return result; + } + + @Override + public String format(Collection<E> e) { + if (CollectionUtils.isEmpty(e)) { + return ""; + } + Collection<String> ids = Lists.newArrayList(); + for (E e1 : e) { + ids.add(e1.getTopiaId()); + } + String value = StringUtil.join(ids, "|", true); + return value; + } + } + + public static final AssociationValueParser ASSOCIATION_VALUE_PARSER = new AssociationValueParser(); + + public static class AssociationValueParser implements ValueParser<String[]> { + + @Override + public String[] parse(String value) throws ParseException { + String[] ids = value.split("\\|"); + return ids; + } + } + + public static class ForeignKeyValue<E extends TopiaEntity> implements ValueParserFormatter<E> { + + protected final Class<E> entityType; + + protected final Map<String, E> universe; + + public ForeignKeyValue(Class<E> entityType, + Map<String, E> universe) { + this.entityType = entityType; + this.universe = universe; + } + + public ForeignKeyValue(Class<E> entityType) { + this.entityType = entityType; + universe = Maps.newHashMap(); + } + + @Override + public E parse(String value) throws ParseException { + E result = null; + if (StringUtils.isNotBlank(value)) { + + // get entity from universe + result = universe.get(value); + + if (result == null) { + + // can not find entity this is a big problem for us... + throw new EchoBaseTechnicalException( + "Could not find entity with name " + value); + } + } + return result; + } + + @Override + public String format(E e) { + String value = ""; + if (e != null) { + value = e.getTopiaId(); + } + return value; + } + } + + public static class ForeignKeyDecoratedValue<E extends TopiaEntity> implements ValueFormatter<E> { + + protected final Class<E> entityType; + + protected final DecoratorService decoratorService; + + protected final Locale locale; + + public ForeignKeyDecoratedValue(Class<E> entityType, DecoratorService decoratorService, Locale locale) { + this.entityType = entityType; + this.decoratorService = decoratorService; + this.locale = locale; + + } + + @Override + public String format(E e) { + String value = ""; + if (e != null) { + + value = decoratorService.decorate(locale, e, null); + } + return value; + } + } + + protected CsvModelUtil() { + // avoid instanciation on helper class + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CsvModelUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java (from rev 235, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityAssociationExportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java 2012-01-05 10:42:31 UTC (rev 238) @@ -0,0 +1,87 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.csv; + +import fr.ifremer.echobase.entities.meta.AssociationMeta; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.csv.ExportModel; +import org.nuiton.util.csv.ExportableColumn; +import org.nuiton.util.csv.ModelBuilder; + +import java.util.Collection; + +/** + * A model to export associations of entities into csv files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class EntityAssociationExportModel<E extends TopiaEntity> implements ExportModel<E> { + + protected final char separator; + + protected final AssociationMeta meta; + + protected ModelBuilder<E> modelBuilder; + + public static <E extends TopiaEntity> ExportModel<E> newExportModel(char separator, + AssociationMeta meta + ) { + EntityAssociationExportModel<E> model = new EntityAssociationExportModel<E>( + separator, + meta); + + // topiaId <-> topiaId + model.modelBuilder.newColumnForExport( + TopiaEntity.TOPIA_ID, + TopiaEntity.TOPIA_ID + ); + + model.modelBuilder.newColumnForExport( + meta.getName(), + meta.getName(), + CsvModelUtil.newAssociationValueFormatter() + ); + return model; + } + + @Override + public char getSeparator() { + return separator; + } + + @Override + public Iterable<ExportableColumn<E, Object>> getColumnsForExport() { + return (Collection) + modelBuilder.getColumnsForExport(); + } + + protected EntityAssociationExportModel(char separator, AssociationMeta meta) { + this.separator = separator; + this.meta = meta; + modelBuilder = new ModelBuilder<E>(); + } + + +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationExportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java (from rev 235, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityAssociationImportModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java 2012-01-05 10:42:31 UTC (rev 238) @@ -0,0 +1,102 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.csv; + +import fr.ifremer.echobase.entities.meta.AssociationMeta; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.csv.ImportModel; +import org.nuiton.util.csv.ImportableColumn; +import org.nuiton.util.csv.ModelBuilder; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * A model to import associations of entities into csv files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class EntityAssociationImportModel implements ImportModel<Map<String, Object>> { + + protected final char separator; + + protected final AssociationMeta meta; + + protected ModelBuilder<Map<String, Object>> modelBuilder; + + public static ImportModel<Map<String, Object>> newImportModel(char separator, + AssociationMeta meta + ) { + EntityAssociationImportModel model = new EntityAssociationImportModel( + separator, meta); + + // topiaId <-> topiaId + model.modelBuilder.newMandatoryColumn( + TopiaEntity.TOPIA_ID, + CsvModelUtil.<Map<String, Object>, String>newMapProperty(TopiaEntity.TOPIA_ID) + ); + + // add association -> target +// Class<TopiaEntity> target = +// (Class<TopiaEntity>) meta.getTarget().getImplementation(); + + model.modelBuilder.newMandatoryColumn( + meta.getName(), + CsvModelUtil.ASSOCIATION_VALUE_PARSER, + CsvModelUtil.<Map<String, Object>, String[]>newMapProperty("target") + ); + + return model; + } + + @Override + public char getSeparator() { + return separator; + } + + @Override + public Iterable<ImportableColumn<Map<String, Object>, Object>> getColumnsForImport() { + return (Collection) + modelBuilder.getColumnsForImport(); + } + + @Override + public void pushCsvHeaderNames(List<String> headerNames) { + } + + @Override + public Map<String, Object> newEmptyInstance() { + return null; + } + + protected EntityAssociationImportModel(char separator, AssociationMeta meta) { + this.separator = separator; + this.meta = meta; + modelBuilder = new ModelBuilder<Map<String, Object>>(); + } + + +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityAssociationImportModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java (from rev 235, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityCsvModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java 2012-01-05 10:42:31 UTC (rev 238) @@ -0,0 +1,256 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.csv; + +import com.google.common.base.Function; +import fr.ifremer.echobase.entities.meta.TableMeta; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.csv.ExportableColumn; +import org.nuiton.util.csv.ImportExportModel; +import org.nuiton.util.csv.ImportableColumn; +import org.nuiton.util.csv.ModelBuilder; +import org.nuiton.util.csv.ValueParser; + +import java.util.Collection; +import java.util.Date; +import java.util.List; + +/** + * A model to import / export entities into csv files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class EntityCsvModel<E extends TopiaEntity> implements ImportExportModel<E> { + + protected final char separator; + + protected final TableMeta tableMeta; + + protected ModelBuilder<E> modelBuilder; + + public static <E extends TopiaEntity> EntityCsvModel<E> newModel( + char separator, + TableMeta tableMeta + ) { + return new EntityCsvModel<E>(separator, tableMeta); + } + + public static <E extends TopiaEntity> EntityCsvModel<E> newModel( + char separator, + TableMeta tableMeta, + String idHeader + ) { + return new EntityCsvModel<E>(separator, tableMeta, idHeader); + } + + @Override + public char getSeparator() { + return separator; + } + + @Override + public Collection<ExportableColumn<E, Object>> getColumnsForExport() { + return (Collection) + modelBuilder.getColumnsForExport(); + } + + @Override + public Collection<ImportableColumn<E, Object>> getColumnsForImport() { + return (Collection) + modelBuilder.getColumnsForImport(); + } + + @Override + public void pushCsvHeaderNames(List<String> headerNames) { + } + + public <T> ImportableColumn<E, T> newIgnoredColumn(String headerName) { + return modelBuilder.newIgnoredColumn(headerName); + } + + @Override + public E newEmptyInstance() { + return (E) tableMeta.newEntity(); + } + + public void addForeignKeyForExport(String propertyName, + Class<TopiaEntity> entityType) { + + modelBuilder.newColumnForExport( + propertyName, + propertyName, + CsvModelUtil.newForeignKeyValue(entityType) + ); + } + + public <E extends TopiaEntity> void addForeignKeyForImport(String headerName, + String propertyName, + Class<E> entityType, + Collection<E> universe, + Function<E, String> transform) { + + modelBuilder.newMandatoryColumn( + headerName, + propertyName, + CsvModelUtil.newForeignKeyValue(entityType, universe, transform) + ); + } + + public <E extends TopiaEntity> void addForeignKeyForImport(String propertyName, + Class<E> entityType, + Collection<E> universe) { + + modelBuilder.newMandatoryColumn( + propertyName, + propertyName, + CsvModelUtil.newForeignKeyValue(entityType, universe) + ); + } + + public void addNewColumnForExport(String headerName, + String propertyName, + CsvModelUtil.ForeignKeyDecoratedValue<TopiaEntity> topiaEntityForeignKeyDecoratedValue) { + modelBuilder.newColumnForExport( + headerName, + propertyName, + topiaEntityForeignKeyDecoratedValue + ); + } + + public void addDefaultColumn(String propertyName, + Class<?> type) { + addDefaultColumn(propertyName, propertyName, type); + } + + public void addDefaultColumn(String headerName, + String propertyName, + Class<?> type) { + + if (Date.class.equals(type)) { + modelBuilder.newColumnForImportExport( + headerName, + propertyName, + CsvModelUtil.DAY_TIME_SECOND + ); + } else if (double.class.equals(type)) { + modelBuilder.newColumnForImportExport( + headerName, + propertyName, + CsvModelUtil.DOUBLE_PRIMITIVE + ); + } else if (Double.class.equals(type)) { + modelBuilder.newColumnForImportExport( + headerName, + propertyName, + CsvModelUtil.DOUBLE + ); + } else if (long.class.equals(type)) { + modelBuilder.newColumnForImportExport( + headerName, + propertyName, + CsvModelUtil.PRIMITIVE_LONG + ); + } else if (Long.class.equals(type)) { + modelBuilder.newColumnForImportExport( + headerName, + propertyName, + CsvModelUtil.LONG + ); + } else if (float.class.equals(type)) { + modelBuilder.newColumnForImportExport( + headerName, + propertyName, + CsvModelUtil.PRIMITIVE_FLOAT + ); + } else if (Float.class.equals(type)) { + modelBuilder.newColumnForImportExport( + headerName, + propertyName, + CsvModelUtil.FLOAT + ); + } else if (int.class.equals(type)) { + modelBuilder.newColumnForImportExport( + headerName, + propertyName, + CsvModelUtil.PRIMITIVE_INTEGER + ); + } else if (Integer.class.equals(type)) { + modelBuilder.newColumnForImportExport( + headerName, + propertyName, + CsvModelUtil.INTEGER + ); + } else if (boolean.class.equals(type)) { + modelBuilder.newColumnForImportExport( + headerName, + propertyName, + CsvModelUtil.PRIMITIVE_BOOLEAN + ); + } else if (Boolean.class.equals(type)) { + modelBuilder.newColumnForImportExport( + headerName, + propertyName, + CsvModelUtil.BOOLEAN + ); + } else { + + // string + modelBuilder.newColumnForImportExport( + headerName, + propertyName + ); + } + } + + public ImportableColumn<E, String> newMandatoryColumn(String headerName, + String propertyName) { + return modelBuilder.newMandatoryColumn(headerName, propertyName); + } + + public ImportableColumn<E, String> newMandatoryColumn(String headerName) { + return modelBuilder.newMandatoryColumn(headerName, headerName); + } + + public <T> ImportableColumn<E, T> newMandatoryColumn(String headerName, String propertyName, ValueParser<T> valueParser) { + return modelBuilder.newMandatoryColumn(headerName, valueParser, CsvModelUtil.<E, T>newBeanProperty(propertyName)); + } + + protected EntityCsvModel(char separator, + TableMeta tableMeta) { + this.separator = separator; + this.tableMeta = tableMeta; + modelBuilder = new ModelBuilder<E>(); + } + + protected EntityCsvModel(char separator, + TableMeta tableMeta, + String idHeader) { + this(separator, tableMeta); + modelBuilder.newColumnForImportExport( + idHeader, + TopiaEntity.TOPIA_ID + ); + } +} \ No newline at end of file Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EntityCsvModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java (from rev 235, trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/ExportQueryCsvModel.java) =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java (rev 0) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java 2012-01-05 10:42:31 UTC (rev 238) @@ -0,0 +1,86 @@ +/* + * #%L + * EchoBase :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Ifremer, Codelutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package fr.ifremer.echobase.services.csv; + +import fr.ifremer.echobase.services.ExportQueryService; +import org.nuiton.util.csv.ExportableColumn; +import org.nuiton.util.csv.ImportExportModel; +import org.nuiton.util.csv.ImportableColumn; +import org.nuiton.util.csv.ModelBuilder; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * Csv model to export sql in {@link ExportQueryService}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.2 + */ +public class ExportQueryCsvModel implements ImportExportModel<Map<String, Object>> { + + + protected final char separator; + + protected final ModelBuilder<?> modelBuilder; + + public ExportQueryCsvModel(char separator, String[] columnHeaders) { + this.separator = separator; + modelBuilder = new ModelBuilder<Object>(); + for (String columnHeader : columnHeaders) { + modelBuilder.newColumnForExport( + columnHeader, + columnHeader, + CsvModelUtil.TO_STRING_FORMATTER + ); + } + } + + @Override + public char getSeparator() { + return separator; + } + + @Override + public Collection<ExportableColumn<Map<String, Object>, Object>> getColumnsForExport() { + return (Collection) modelBuilder.getColumnsForExport(); + } + + @Override + public Collection<ImportableColumn<Map<String, Object>, Object>> getColumnsForImport() { + // never do import from this model + throw new UnsupportedOperationException(); + } + + @Override + public void pushCsvHeaderNames(List<String> headerNames) { + } + + @Override + public Map<String, Object> newEmptyInstance() { + // never do import from this model + throw new UnsupportedOperationException(); + } +} Property changes on: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ExportQueryCsvModel.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/CsvModelUtil.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/CsvModelUtil.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/CsvModelUtil.java 2012-01-05 10:42:31 UTC (rev 238) @@ -1,263 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services.models; - -import com.google.common.base.Function; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import fr.ifremer.echobase.EchoBaseFunctions; -import fr.ifremer.echobase.EchoBaseTechnicalException; -import fr.ifremer.echobase.services.DecoratorService; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.StringUtil; -import org.nuiton.util.csv.Common; -import org.nuiton.util.csv.ValueFormatter; -import org.nuiton.util.csv.ValueParser; -import org.nuiton.util.csv.ValueParserFormatter; - -import java.text.ParseException; -import java.util.Collection; -import java.util.Date; -import java.util.Locale; -import java.util.Map; - -/** - * Usefull class to build csv import-export models. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class CsvModelUtil extends Common { - - public static <E extends TopiaEntity> ForeignKeyValue<E> newForeignKeyValue(Class<E> type) { - return new ForeignKeyValue<E>(type); - } - - public static <E extends TopiaEntity> ForeignKeyValue<E> newForeignKeyValue(Class<E> type, Collection<E> entitites) { - Map<String, E> universe = Maps.uniqueIndex(entitites, EchoBaseFunctions.TO_TOPIAID); - return newForeignKeyValue(type, universe); - } - - public static <E extends TopiaEntity> ForeignKeyValue<E> newForeignKeyValue(Class<E> type, Map<String, E> universe) { - return new ForeignKeyValue<E>(type, universe); - } - - public static <E extends TopiaEntity> ForeignKeyValue<E> newForeignKeyValue(Class<E> type, Collection<E> entitites, Function<E, String> transform) { - Map<String, E> universe = Maps.uniqueIndex(entitites, transform); - return new ForeignKeyValue<E>(type, universe); - } - - public static <E extends TopiaEntity> ForeignKeyDecoratedValue<E> newForeignKeyDecoratedValue(Class<E> entityType, - DecoratorService decoratorService, Locale locale) { - return new ForeignKeyDecoratedValue<E>(entityType, decoratorService, locale); - } - - public static <E extends TopiaEntity> ValueFormatter<Collection<E>> newAssociationValueFormatter() { - return new AssociationValueParserFormatter<E>(null, null); - } - - public static <E extends TopiaEntity> AssociationValueParserFormatter<E> newAssociationValueParserFormatter(Class<E> entityType, - Map<String, E> universe) { - return new AssociationValueParserFormatter<E>(entityType, universe); - } - - public static final ValueParser<Date> IMPORT_DAY = new DateValue("dd/MM/yy"); - - public static class BooleanParserFormatter extends NullableParserFormatter<Boolean> { - - public BooleanParserFormatter(Boolean defaultValue, boolean nullAllowed) { - super(defaultValue, nullAllowed); - } - - @Override - public String format(Boolean bool) { - String value; - if (bool == null) { - if (nullAllowed) { - value = "?"; - } else { - throw new IllegalArgumentException(); - } - } else if (bool) { - value = "Y"; - } else { - value = "N"; - } - return value; - } - - @Override - protected Boolean parseNoneEmptyValue(String value) { - Boolean result; - if ("?".equals(value)) { - result = null; - } else if ("Y".equals(value)) { - result = true; - } else if ("N".equals(value)) { - result = false; - } else { - result = Boolean.parseBoolean(value); - } - return result; - } - } - - public static final ValueParser<Boolean> INT_TO_BOOLEAN_PARSER = new ValueParser<Boolean>() { - - @Override - public Boolean parse(String value) { - return "1".equals(value); - } - }; - - public static class AssociationValueParserFormatter<E extends TopiaEntity> implements ValueParserFormatter<Collection<E>> { - - protected final Class<E> entityType; - - protected final Map<String, E> universe; - - public AssociationValueParserFormatter( - Class<E> entityType, - Map<String, E> universe) { - this.entityType = entityType; - this.universe = universe; - } - - @Override - public Collection<E> parse(String value) throws ParseException { - Collection<E> result = Lists.newArrayList(); - if (StringUtils.isNotBlank(value)) { - - String[] ids = value.split("\\|"); - for (String id : ids) { - E association = universe.get(id); - association.setTopiaId(id); - result.add(association); - } - } - return result; - } - - @Override - public String format(Collection<E> e) { - if (CollectionUtils.isEmpty(e)) { - return ""; - } - Collection<String> ids = Lists.newArrayList(); - for (E e1 : e) { - ids.add(e1.getTopiaId()); - } - String value = StringUtil.join(ids, "|", true); - return value; - } - } - - public static final AssociationValueParser ASSOCIATION_VALUE_PARSER = new AssociationValueParser(); - - public static class AssociationValueParser implements ValueParser<String[]> { - - @Override - public String[] parse(String value) throws ParseException { - String[] ids = value.split("\\|"); - return ids; - } - } - - public static class ForeignKeyValue<E extends TopiaEntity> implements ValueParserFormatter<E> { - - protected final Class<E> entityType; - - protected final Map<String, E> universe; - - public ForeignKeyValue(Class<E> entityType, - Map<String, E> universe) { - this.entityType = entityType; - this.universe = universe; - } - - public ForeignKeyValue(Class<E> entityType) { - this.entityType = entityType; - universe = Maps.newHashMap(); - } - - @Override - public E parse(String value) throws ParseException { - E result = null; - if (StringUtils.isNotBlank(value)) { - - // get entity from universe - result = universe.get(value); - - if (result == null) { - - // can not find entity this is a big problem for us... - throw new EchoBaseTechnicalException( - "Could not find entity with name " + value); - } - } - return result; - } - - @Override - public String format(E e) { - String value = ""; - if (e != null) { - value = e.getTopiaId(); - } - return value; - } - } - - public static class ForeignKeyDecoratedValue<E extends TopiaEntity> implements ValueFormatter<E> { - - protected final Class<E> entityType; - - protected final DecoratorService decoratorService; - - protected final Locale locale; - - public ForeignKeyDecoratedValue(Class<E> entityType, DecoratorService decoratorService, Locale locale) { - this.entityType = entityType; - this.decoratorService = decoratorService; - this.locale = locale; - - } - - @Override - public String format(E e) { - String value = ""; - if (e != null) { - - value = decoratorService.decorate(locale, e, null); - } - return value; - } - } - - protected CsvModelUtil() { - // avoid instanciation on helper class - } -} Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityAssociationExportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityAssociationExportModel.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityAssociationExportModel.java 2012-01-05 10:42:31 UTC (rev 238) @@ -1,87 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services.models; - -import fr.ifremer.echobase.entities.meta.AssociationMeta; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.csv.ExportModel; -import org.nuiton.util.csv.ExportableColumn; -import org.nuiton.util.csv.ModelBuilder; - -import java.util.Collection; - -/** - * A model to export associations of entities into csv files. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class EntityAssociationExportModel<E extends TopiaEntity> implements ExportModel<E> { - - protected final char separator; - - protected final AssociationMeta meta; - - protected ModelBuilder<E> modelBuilder; - - public static <E extends TopiaEntity> ExportModel<E> newExportModel(char separator, - AssociationMeta meta - ) { - EntityAssociationExportModel<E> model = new EntityAssociationExportModel<E>( - separator, - meta); - - // topiaId <-> topiaId - model.modelBuilder.newColumnForExport( - TopiaEntity.TOPIA_ID, - TopiaEntity.TOPIA_ID - ); - - model.modelBuilder.newColumnForExport( - meta.getName(), - meta.getName(), - CsvModelUtil.newAssociationValueFormatter() - ); - return model; - } - - @Override - public char getSeparator() { - return separator; - } - - @Override - public Iterable<ExportableColumn<E, Object>> getColumnsForExport() { - return (Collection) - modelBuilder.getColumnsForExport(); - } - - protected EntityAssociationExportModel(char separator, AssociationMeta meta) { - this.separator = separator; - this.meta = meta; - modelBuilder = new ModelBuilder<E>(); - } - - -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityAssociationImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityAssociationImportModel.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityAssociationImportModel.java 2012-01-05 10:42:31 UTC (rev 238) @@ -1,102 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services.models; - -import fr.ifremer.echobase.entities.meta.AssociationMeta; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * A model to import associations of entities into csv files. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class EntityAssociationImportModel implements ImportModel<Map<String, Object>> { - - protected final char separator; - - protected final AssociationMeta meta; - - protected ModelBuilder<Map<String, Object>> modelBuilder; - - public static ImportModel<Map<String, Object>> newImportModel(char separator, - AssociationMeta meta - ) { - EntityAssociationImportModel model = new EntityAssociationImportModel( - separator, meta); - - // topiaId <-> topiaId - model.modelBuilder.newMandatoryColumn( - TopiaEntity.TOPIA_ID, - CsvModelUtil.<Map<String, Object>, String>newMapProperty(TopiaEntity.TOPIA_ID) - ); - - // add association -> target -// Class<TopiaEntity> target = -// (Class<TopiaEntity>) meta.getTarget().getImplementation(); - - model.modelBuilder.newMandatoryColumn( - meta.getName(), - CsvModelUtil.ASSOCIATION_VALUE_PARSER, - CsvModelUtil.<Map<String, Object>, String[]>newMapProperty("target") - ); - - return model; - } - - @Override - public char getSeparator() { - return separator; - } - - @Override - public Iterable<ImportableColumn<Map<String, Object>, Object>> getColumnsForImport() { - return (Collection) - modelBuilder.getColumnsForImport(); - } - - @Override - public void pushCsvHeaderNames(List<String> headerNames) { - } - - @Override - public Map<String, Object> newEmptyInstance() { - return null; - } - - protected EntityAssociationImportModel(char separator, AssociationMeta meta) { - this.separator = separator; - this.meta = meta; - modelBuilder = new ModelBuilder<Map<String, Object>>(); - } - - -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityCsvModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityCsvModel.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/EntityCsvModel.java 2012-01-05 10:42:31 UTC (rev 238) @@ -1,256 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services.models; - -import com.google.common.base.Function; -import fr.ifremer.echobase.entities.meta.TableMeta; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.util.csv.ExportableColumn; -import org.nuiton.util.csv.ImportExportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import org.nuiton.util.csv.ValueParser; - -import java.util.Collection; -import java.util.Date; -import java.util.List; - -/** - * A model to import / export entities into csv files. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class EntityCsvModel<E extends TopiaEntity> implements ImportExportModel<E> { - - protected final char separator; - - protected final TableMeta tableMeta; - - protected ModelBuilder<E> modelBuilder; - - public static <E extends TopiaEntity> EntityCsvModel<E> newModel( - char separator, - TableMeta tableMeta - ) { - return new EntityCsvModel<E>(separator, tableMeta); - } - - public static <E extends TopiaEntity> EntityCsvModel<E> newModel( - char separator, - TableMeta tableMeta, - String idHeader - ) { - return new EntityCsvModel<E>(separator, tableMeta, idHeader); - } - - @Override - public char getSeparator() { - return separator; - } - - @Override - public Collection<ExportableColumn<E, Object>> getColumnsForExport() { - return (Collection) - modelBuilder.getColumnsForExport(); - } - - @Override - public Collection<ImportableColumn<E, Object>> getColumnsForImport() { - return (Collection) - modelBuilder.getColumnsForImport(); - } - - @Override - public void pushCsvHeaderNames(List<String> headerNames) { - } - - public <T> ImportableColumn<E, T> newIgnoredColumn(String headerName) { - return modelBuilder.newIgnoredColumn(headerName); - } - - @Override - public E newEmptyInstance() { - return (E) tableMeta.newEntity(); - } - - public void addForeignKeyForExport(String propertyName, - Class<TopiaEntity> entityType) { - - modelBuilder.newColumnForExport( - propertyName, - propertyName, - CsvModelUtil.newForeignKeyValue(entityType) - ); - } - - public <E extends TopiaEntity> void addForeignKeyForImport(String headerName, - String propertyName, - Class<E> entityType, - Collection<E> universe, - Function<E, String> transform) { - - modelBuilder.newMandatoryColumn( - headerName, - propertyName, - CsvModelUtil.newForeignKeyValue(entityType, universe, transform) - ); - } - - public <E extends TopiaEntity> void addForeignKeyForImport(String propertyName, - Class<E> entityType, - Collection<E> universe) { - - modelBuilder.newMandatoryColumn( - propertyName, - propertyName, - CsvModelUtil.newForeignKeyValue(entityType, universe) - ); - } - - public void addNewColumnForExport(String headerName, - String propertyName, - CsvModelUtil.ForeignKeyDecoratedValue<TopiaEntity> topiaEntityForeignKeyDecoratedValue) { - modelBuilder.newColumnForExport( - headerName, - propertyName, - topiaEntityForeignKeyDecoratedValue - ); - } - - public void addDefaultColumn(String propertyName, - Class<?> type) { - addDefaultColumn(propertyName, propertyName, type); - } - - public void addDefaultColumn(String headerName, - String propertyName, - Class<?> type) { - - if (Date.class.equals(type)) { - modelBuilder.newColumnForImportExport( - headerName, - propertyName, - CsvModelUtil.DAY_TIME_SECOND - ); - } else if (double.class.equals(type)) { - modelBuilder.newColumnForImportExport( - headerName, - propertyName, - CsvModelUtil.DOUBLE_PRIMITIVE - ); - } else if (Double.class.equals(type)) { - modelBuilder.newColumnForImportExport( - headerName, - propertyName, - CsvModelUtil.DOUBLE - ); - } else if (long.class.equals(type)) { - modelBuilder.newColumnForImportExport( - headerName, - propertyName, - CsvModelUtil.PRIMITIVE_LONG - ); - } else if (Long.class.equals(type)) { - modelBuilder.newColumnForImportExport( - headerName, - propertyName, - CsvModelUtil.LONG - ); - } else if (float.class.equals(type)) { - modelBuilder.newColumnForImportExport( - headerName, - propertyName, - CsvModelUtil.PRIMITIVE_FLOAT - ); - } else if (Float.class.equals(type)) { - modelBuilder.newColumnForImportExport( - headerName, - propertyName, - CsvModelUtil.FLOAT - ); - } else if (int.class.equals(type)) { - modelBuilder.newColumnForImportExport( - headerName, - propertyName, - CsvModelUtil.PRIMITIVE_INTEGER - ); - } else if (Integer.class.equals(type)) { - modelBuilder.newColumnForImportExport( - headerName, - propertyName, - CsvModelUtil.INTEGER - ); - } else if (boolean.class.equals(type)) { - modelBuilder.newColumnForImportExport( - headerName, - propertyName, - CsvModelUtil.PRIMITIVE_BOOLEAN - ); - } else if (Boolean.class.equals(type)) { - modelBuilder.newColumnForImportExport( - headerName, - propertyName, - CsvModelUtil.BOOLEAN - ); - } else { - - // string - modelBuilder.newColumnForImportExport( - headerName, - propertyName - ); - } - } - - public ImportableColumn<E, String> newMandatoryColumn(String headerName, - String propertyName) { - return modelBuilder.newMandatoryColumn(headerName, propertyName); - } - - public ImportableColumn<E, String> newMandatoryColumn(String headerName) { - return modelBuilder.newMandatoryColumn(headerName, headerName); - } - - public <T> ImportableColumn<E, T> newMandatoryColumn(String headerName, String propertyName, ValueParser<T> valueParser) { - return modelBuilder.newMandatoryColumn(headerName, valueParser, CsvModelUtil.<E, T>newBeanProperty(propertyName)); - } - - protected EntityCsvModel(char separator, - TableMeta tableMeta) { - this.separator = separator; - this.tableMeta = tableMeta; - modelBuilder = new ModelBuilder<E>(); - } - - protected EntityCsvModel(char separator, - TableMeta tableMeta, - String idHeader) { - this(separator, tableMeta); - modelBuilder.newColumnForImportExport( - idHeader, - TopiaEntity.TOPIA_ID - ); - } -} \ No newline at end of file Deleted: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/ExportQueryCsvModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/ExportQueryCsvModel.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/models/ExportQueryCsvModel.java 2012-01-05 10:42:31 UTC (rev 238) @@ -1,86 +0,0 @@ -/* - * #%L - * EchoBase :: Services - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2011 Ifremer, Codelutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ifremer.echobase.services.models; - -import fr.ifremer.echobase.services.ExportQueryService; -import org.nuiton.util.csv.ExportableColumn; -import org.nuiton.util.csv.ImportExportModel; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * Csv model to export sql in {@link ExportQueryService}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.2 - */ -public class ExportQueryCsvModel implements ImportExportModel<Map<String, Object>> { - - - protected final char separator; - - protected final ModelBuilder<?> modelBuilder; - - public ExportQueryCsvModel(char separator, String[] columnHeaders) { - this.separator = separator; - modelBuilder = new ModelBuilder<Object>(); - for (String columnHeader : columnHeaders) { - modelBuilder.newColumnForExport( - columnHeader, - columnHeader, - CsvModelUtil.TO_STRING_FORMATTER - ); - } - } - - @Override - public char getSeparator() { - return separator; - } - - @Override - public Collection<ExportableColumn<Map<String, Object>, Object>> getColumnsForExport() { - return (Collection) modelBuilder.getColumnsForExport(); - } - - @Override - public Collection<ImportableColumn<Map<String, Object>, Object>> getColumnsForImport() { - // never do import from this model - throw new UnsupportedOperationException(); - } - - @Override - public void pushCsvHeaderNames(List<String> headerNames) { - } - - @Override - public Map<String, Object> newEmptyInstance() { - // never do import from this model - throw new UnsupportedOperationException(); - } -} 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 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/EchoBaseDbCreator.java 2012-01-05 10:42:31 UTC (rev 238) @@ -31,7 +31,7 @@ import com.healthmarketscience.jackcess.Table; import fr.ifremer.echobase.EchoBaseFunctions; import fr.ifremer.echobase.EchoBaseIOUtil; -import fr.ifremer.echobase.services.models.CsvModelUtil; +import fr.ifremer.echobase.services.csv.CsvModelUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AgeCategoryLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AgeCategoryLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/AgeCategoryLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.AgeCategory; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellMethodLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellMethodLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellMethodLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.CellMethod; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellTypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellTypeLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellTypeLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.CellType; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataMetadataLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -33,7 +33,7 @@ import fr.ifremer.echobase.entities.references.DataMetadata; import fr.ifremer.echobase.entities.references.DataType; import fr.ifremer.echobase.entities.references.ReferenceDatum; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataQualityLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataQualityLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataQualityLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.DataQuality; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataTypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataTypeLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/DataTypeLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.DataType; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EchotypeLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -29,7 +29,7 @@ import fr.ifremer.echobase.entities.references.Echotype; import fr.ifremer.echobase.entities.references.EchotypeCategory; import fr.ifremer.echobase.entities.references.Species; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import java.util.List; 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 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/EntityLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -42,7 +42,7 @@ import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.ExportService; import fr.ifremer.echobase.services.ImportService; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; 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 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -25,8 +25,8 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.Gear; -import fr.ifremer.echobase.services.models.CsvModelUtil; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.CsvModelUtil; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import java.util.Date; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/GearMetadataLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -28,7 +28,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.GearMetadata; import fr.ifremer.echobase.entities.references.OperationEvent; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import java.util.List; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationEventLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationEventLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationEventLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.OperationEvent; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationMetadataLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -29,7 +29,7 @@ import fr.ifremer.echobase.entities.references.GearMetadata; import fr.ifremer.echobase.entities.references.OperationEvent; import fr.ifremer.echobase.entities.references.OperationMetadata; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import java.util.List; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -30,7 +30,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.ReferenceDatum; import fr.ifremer.echobase.entities.references.ReferenceDatumType; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumTypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumTypeLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/ReferenceDatumTypeLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.ReferenceDatumType; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleDataTypeLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.SampleDataType; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SampleTypeLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -26,7 +26,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.SampleDataType; import fr.ifremer.echobase.entities.references.SampleType; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SexCategoryLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.SexCategory; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SizeCategoryLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -26,7 +26,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.SexCategory; import fr.ifremer.echobase.entities.references.SizeCategory; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SpeciesLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SpeciesLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/SpeciesLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.Species; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/StrataLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/StrataLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/StrataLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.Strata; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoader.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VesselTypeLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -25,7 +25,7 @@ import fr.ifremer.echobase.entities.meta.TableMeta; import fr.ifremer.echobase.entities.references.VesselType; -import fr.ifremer.echobase.services.models.EntityCsvModel; +import fr.ifremer.echobase.services.csv.EntityCsvModel; import fr.ifremer.echobase.tools.FileType; /** 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 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java 2012-01-05 10:42:31 UTC (rev 238) @@ -37,7 +37,7 @@ import fr.ifremer.echobase.entities.references.Echotype; import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.entities.references.Species; -import fr.ifremer.echobase.services.models.CsvModelUtil; +import fr.ifremer.echobase.services.csv.CsvModelUtil; import fr.ifremer.echobase.tools.FileType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-ui/pom.xml 2012-01-05 10:42:31 UTC (rev 238) @@ -289,6 +289,7 @@ <webAppConfig> <contextPath>/echobase</contextPath> </webAppConfig> + <jvmArgs>-Xms512m -Xmx1512m</jvmArgs> </configuration> </plugin> @@ -381,5 +382,38 @@ </profile> + <profile> + <id>add-log-to-jetty</id> + <activation> + <file> + <exists>/var/local/echobase</exists> + </file> + </activation> + + <build> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <configuration> + <stopKey>A</stopKey> + <stopPort>1269</stopPort> + <systemProperties> + <systemProperty> + <name>echobase.log.dir</name> + <value>/var/local/echobase/log</value> + </systemProperty> + </systemProperties> + </configuration> + </plugin> + </plugins> + </pluginManagement> + + </build> + + </profile> + </profiles> </project> Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseSession.java 2012-01-05 10:42:31 UTC (rev 238) @@ -24,10 +24,10 @@ package fr.ifremer.echobase.ui; import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.services.EmbeddedApplicationConfiguration; -import fr.ifremer.echobase.services.ExportDbConfiguration; -import fr.ifremer.echobase.services.ImportDataConfiguration; -import fr.ifremer.echobase.services.ImportDbConfiguration; +import fr.ifremer.echobase.services.configurations.EmbeddedApplicationConfiguration; +import fr.ifremer.echobase.services.configurations.ExportDbConfiguration; +import fr.ifremer.echobase.services.configurations.ImportDataConfiguration; +import fr.ifremer.echobase.services.configurations.ImportDbConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/AbstractWaitAndExecAction.java 2012-01-05 10:42:31 UTC (rev 238) @@ -25,7 +25,7 @@ import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.Preparable; -import fr.ifremer.echobase.services.AbstractEchobaseActionConfiguration; +import fr.ifremer.echobase.services.configurations.AbstractEchobaseActionConfiguration; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaContextImplementor; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Build.java 2012-01-05 10:42:31 UTC (rev 238) @@ -23,7 +23,7 @@ */ package fr.ifremer.echobase.ui.actions.embeddedApplication; -import fr.ifremer.echobase.services.EmbeddedApplicationConfiguration; +import fr.ifremer.echobase.services.configurations.EmbeddedApplicationConfiguration; import fr.ifremer.echobase.services.EmbeddedApplicationService; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Configure.java 2012-01-05 10:42:31 UTC (rev 238) @@ -26,7 +26,7 @@ import fr.ifremer.echobase.EchoBaseConfiguration; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.EmbeddedApplicationConfiguration; +import fr.ifremer.echobase.services.configurations.EmbeddedApplicationConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/embeddedApplication/Download.java 2012-01-05 10:42:31 UTC (rev 238) @@ -23,7 +23,7 @@ */ package fr.ifremer.echobase.ui.actions.embeddedApplication; -import fr.ifremer.echobase.services.EmbeddedApplicationConfiguration; +import fr.ifremer.echobase.services.configurations.EmbeddedApplicationConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import java.io.BufferedInputStream; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Configure.java 2012-01-05 10:42:31 UTC (rev 238) @@ -23,7 +23,7 @@ */ package fr.ifremer.echobase.ui.actions.exportDb; -import fr.ifremer.echobase.services.ExportDbConfiguration; +import fr.ifremer.echobase.services.configurations.ExportDbConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Download.java 2012-01-05 10:42:31 UTC (rev 238) @@ -23,7 +23,7 @@ */ package fr.ifremer.echobase.ui.actions.exportDb; -import fr.ifremer.echobase.services.ExportDbConfiguration; +import fr.ifremer.echobase.services.configurations.ExportDbConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import java.io.BufferedInputStream; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/exportDb/Export.java 2012-01-05 10:42:31 UTC (rev 238) @@ -24,7 +24,7 @@ package fr.ifremer.echobase.ui.actions.exportDb; import fr.ifremer.echobase.services.ExportDbService; -import fr.ifremer.echobase.services.ExportDbConfiguration; +import fr.ifremer.echobase.services.configurations.ExportDbConfiguration; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/ConfigureFiles.java 2012-01-05 10:42:31 UTC (rev 238) @@ -27,7 +27,7 @@ import com.opensymphony.xwork2.Preparable; import fr.ifremer.echobase.entities.references.Mission; import fr.ifremer.echobase.services.EchoBaseServiceSupport; -import fr.ifremer.echobase.services.ImportDataConfiguration; +import fr.ifremer.echobase.services.configurations.ImportDataConfiguration; import fr.ifremer.echobase.services.ImportDataMode; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.io.FileUtils; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/Import.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/Import.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importData/Import.java 2012-01-05 10:42:31 UTC (rev 238) @@ -26,7 +26,7 @@ import com.opensymphony.xwork2.Preparable; import fr.ifremer.echobase.InputFile; import fr.ifremer.echobase.services.CsvImportResult; -import fr.ifremer.echobase.services.ImportDataConfiguration; +import fr.ifremer.echobase.services.configurations.ImportDataConfiguration; import fr.ifremer.echobase.services.ImportDataService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.logging.Log; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Configure.java 2012-01-05 10:42:31 UTC (rev 238) @@ -24,7 +24,7 @@ package fr.ifremer.echobase.ui.actions.importDb; import fr.ifremer.echobase.InputFile; -import fr.ifremer.echobase.services.ImportDbConfiguration; +import fr.ifremer.echobase.services.configurations.ImportDbConfiguration; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-01-05 10:42:31 UTC (rev 238) @@ -24,7 +24,7 @@ package fr.ifremer.echobase.ui.actions.importDb; import fr.ifremer.echobase.services.ImportDbService; -import fr.ifremer.echobase.services.ImportDbConfiguration; +import fr.ifremer.echobase.services.configurations.ImportDbConfiguration; import fr.ifremer.echobase.ui.actions.AbstractWaitAndExecAction; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-01-04 22:49:50 UTC (rev 237) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-01-05 10:42:31 UTC (rev 238) @@ -138,10 +138,10 @@ echobase.title.importData.configuration=Configuration d'un import de données echobase.title.importDataProgress=Import de données en cours echobase.title.importDataResult=Résultats de l'import de données +echobase.title.importDb=Import de données historiques echobase.title.importDb.configuration=Configuration d'un import de base de données echobase.title.importDbProgress=Import de données en cours echobase.title.importDbResult=Résultats de l'import de données -echobase.title.importDb=Import de données historiques echobase.title.importTable=Importer une table echobase.title.login=Connexion echobase.title.modification.detail=Détail de la modification Added: trunk/echobase-ui/src/main/webapp/WEB-INF/log4j.xml =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/log4j.xml (rev 0) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/log4j.xml 2012-01-05 10:42:31 UTC (rev 238) @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<!DOCTYPE log4j:configuration SYSTEM "http://logging.apache.org/log4j/1.2/apidocs/org/apache/log4j/xml/doc-files/…"> +<log4j:configuration xmlns:log4j='http://jakarta.apache.org/log4j/'> + +  +  +  + +  + <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender"> + <param name="File" value="${echobase.log.dir}/echobase.log"/> + <param name="Append" value="false"/> + <param name="DatePattern" value="'.'yyyy-MM-dd"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> + </layout> + </appender> + +  +  +  + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> +  + <param name="ConversionPattern" + value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + + <logger name="org.apache.shiro.realm.AuthorizingRealm"> + <level value="WARN"/> + </logger> + + <root> + <priority value="INFO"/> + <appender-ref ref="FILE"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration>

1 0

r237 - trunk
by tchemit＠users.forge.codelutin.com 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 23:49:50 +0100 (Wed, 04 Jan 2012) New Revision: 237 Url: http://forge.codelutin.com/repositories/revision/echobase/237 Log: updates nuiton-web to 1.9.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 22:47:10 UTC (rev 236) +++ trunk/pom.xml 2012-01-04 22:49:50 UTC (rev 237) @@ -110,7 +110,7 @@ <topiaVersion>2.6.5</topiaVersion> <nuitonUtilsVersion>2.4.1</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <nuitonWebVersion>1.10-SNAPSHOT</nuitonWebVersion> + <nuitonWebVersion>1.9.1</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> <struts2Version>2.3.1.1</struts2Version> <jqueryPluginVersion>3.2.1</jqueryPluginVersion>

1 0

r236 - in trunk/echobase-ui/src/main: resources/config resources/i18n webapp/WEB-INF/jsp webapp/WEB-INF/jsp/exportDb webapp/WEB-INF/jsp/importData webapp/WEB-INF/jsp/importDb
by tchemit＠users.forge.codelutin.com 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 23:47:10 +0100 (Wed, 04 Jan 2012) New Revision: 236 Url: http://forge.codelutin.com/repositories/revision/echobase/236 Log: fix action mappings + remove old directories Removed: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/export/ Modified: trunk/echobase-ui/src/main/resources/config/struts-importDb.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progress.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/result.jsp Modified: trunk/echobase-ui/src/main/resources/config/struts-importDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-01-04 22:46:32 UTC (rev 235) +++ trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-01-04 22:47:10 UTC (rev 236) @@ -37,7 +37,7 @@ <result name="input">/WEB-INF/jsp/importDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/importDb</param> - <param name="actionName">doImport</param> + <param name="actionName">import</param> </result> </action> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-01-04 22:46:32 UTC (rev 235) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-01-04 22:47:10 UTC (rev 236) @@ -141,7 +141,7 @@ echobase.title.importDb.configuration=Configuration d'un import de base de données echobase.title.importDbProgress=Import de données en cours echobase.title.importDbResult=Résultats de l'import de données -echobase.title.importHistorical=Import de données historiques +echobase.title.importDb=Import de données historiques echobase.title.importTable=Importer une table echobase.title.login=Connexion echobase.title.modification.detail=Détail de la modification Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-01-04 22:46:32 UTC (rev 235) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2012-01-04 22:47:10 UTC (rev 236) @@ -38,8 +38,7 @@ </fieldset> <br/> - <s:submit action="configureExport" - value='%{getText("echobase.action.export")}'/> + <s:submit action="configure" value='%{getText("echobase.action.export")}'/> <div>(*) Il s'agit du nom de l'archive, l'extension <strong>.zip</strong> sera automatiquement rajoutée.</div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progress.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progress.jsp 2012-01-04 22:46:32 UTC (rev 235) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/progress.jsp 2012-01-04 22:47:10 UTC (rev 236) @@ -25,7 +25,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<s:url id="url" action="doImport" namespace="/importData"/> +<s:url id="url" action="import" namespace="/importData"/> <meta http-equiv="refresh" content="1;url=${url}"/> <title><s:text name="echobase.title.importDataProgress"/></title> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2012-01-04 22:46:32 UTC (rev 235) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2012-01-04 22:47:10 UTC (rev 236) @@ -24,7 +24,7 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> -<title><s:text name="echobase.title.importHistorical"/></title> +<title><s:text name="echobase.title.importDb"/></title> <s:form namespace="/importDb" method="POST" enctype="multipart/form-data"> @@ -38,7 +38,7 @@ </fieldset> <br/> - <s:submit action="configureImport" + <s:submit action="configure" value='%{getText("echobase.action.import")}'/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/result.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/result.jsp 2012-01-04 22:46:32 UTC (rev 235) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/result.jsp 2012-01-04 22:47:10 UTC (rev 236) @@ -35,5 +35,3 @@ la sauvegarde importée. </div> -<div>TODO</div> -

1 0

r235 - trunk
by tchemit＠users.forge.codelutin.com 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 23:46:32 +0100 (Wed, 04 Jan 2012) New Revision: 235 Url: http://forge.codelutin.com/repositories/revision/echobase/235 Log: updates struts version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 21:27:13 UTC (rev 234) +++ trunk/pom.xml 2012-01-04 22:46:32 UTC (rev 235) @@ -112,8 +112,8 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.10-SNAPSHOT</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - <struts2Version>2.3.1</struts2Version> - <jqueryPluginVersion>3.2.0</jqueryPluginVersion> + <struts2Version>2.3.1.1</struts2Version> + <jqueryPluginVersion>3.2.1</jqueryPluginVersion> <seleniumVersion>2.15.0</seleniumVersion> <h2Version>1.3.162</h2Version> <postgresqlVersion>9.1-901.jdbc4</postgresqlVersion>

1 0

r234 - in trunk/echobase-tools/src: main/java/fr/ifremer/echobase/tools/loaders test/java/fr/ifremer/echobase/tools/loaders test/resources/csv/new
by tchemit＠users.forge.codelutin.com 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 22:27:13 +0100 (Wed, 04 Jan 2012) New Revision: 234 Url: http://forge.codelutin.com/repositories/revision/echobase/234 Log: continue catches import Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationLoaderIT.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java 2012-01-04 20:14:32 UTC (rev 233) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/OperationLoader.java 2012-01-04 21:27:13 UTC (rev 234) @@ -249,12 +249,7 @@ } String operationId = (String) row.get("NOSTA"); - if ("BXXX".equals(operationId)) { - // skip this operation - return null; - } - String gearId = (String) row.get("ENGIN"); if (gearId == null) { if (log.isWarnEnabled()) { Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationLoaderIT.java 2012-01-04 20:14:32 UTC (rev 233) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/OperationLoaderIT.java 2012-01-04 21:27:13 UTC (rev 234) @@ -35,7 +35,7 @@ public class OperationLoaderIT extends AbstractLoaderIT<Operation, OperationLoader> { public OperationLoaderIT() { - super(OperationLoader.class, 0, 1489); + super(OperationLoader.class, 0, 1531); } @Test Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java 2012-01-04 20:14:32 UTC (rev 233) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/loaders/SampleLoaderIT.java 2012-01-04 21:27:13 UTC (rev 234) @@ -35,7 +35,7 @@ public class SampleLoaderIT extends AbstractLoaderIT<Sample, SampleLoader> { public SampleLoaderIT() { - super(SampleLoader.class, 0, 333783); + super(SampleLoader.class, 0,335110); } @Test Modified: trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv =================================================================== --- trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv 2012-01-04 20:14:32 UTC (rev 233) +++ trunk/echobase-tools/src/test/resources/csv/new/input-Gear.csv 2012-01-04 21:27:13 UTC (rev 234) @@ -1,5 +1,5 @@ CasinoGearName;ValidSince;InvalidSince;IsFishingGear;gearLabel;GearName;Description;UpdateDate;GearClassification;ParentGear;Status;IsActive;IsTowed -47,75 x 43,75;01/01/00;;1;47,75 x 43,75;CHANGE ME 47,75 x 43,75;;;5;;;1;1 +47,75 x 43,75;01/01/00;;1;47,75x43,75;Chalut pélagique 47,75 /43,75;;;5;;;1;1 119x102;01/01/00;;1;119x102;Chalut pélagique 119/102;;;5;;;1;1 36x47;01/01/00;;1;GV3647;Chalut de fond GOV 36/47;;;5;;;1;1 57x52;01/01/00;;1;57x52;Chalut pélagique 57/52;;;5;;;1;1

1 0