- Topia-commits - mailman.cloud.codelutin.com

r2631 - branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out
by tchemit＠users.nuiton.org 18 Aug '12

18 Aug '12

Author: tchemit Date: 2012-08-18 12:37:13 +0200 (Sat, 18 Aug 2012) New Revision: 2631 Url: http://nuiton.org/repositories/revision/topia/2631 Log: fix since Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java 2012-08-18 10:02:32 UTC (rev 2630) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java 2012-08-18 10:37:13 UTC (rev 2631) @@ -44,7 +44,7 @@ * Entity visitor to export data to csv files. * * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 + * @since 2.6.12 */ public class ExportEntityVisitor<T extends TopiaEntityEnum> implements EntityVisitor, Closeable {

1 0

r2630 - branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out
by tchemit＠users.nuiton.org 18 Aug '12

18 Aug '12

Author: tchemit Date: 2012-08-18 12:02:32 +0200 (Sat, 18 Aug 2012) New Revision: 2630 Url: http://nuiton.org/repositories/revision/topia/2630 Log: refs #2266: Add some api about import / export in csv format (improve export api) Added: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java Removed: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/AbstractExportEntityVisitor.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java Deleted: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/AbstractExportEntityVisitor.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/AbstractExportEntityVisitor.java 2012-08-18 09:57:33 UTC (rev 2629) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/AbstractExportEntityVisitor.java 2012-08-18 10:02:32 UTC (rev 2630) @@ -1,181 +0,0 @@ -package org.nuiton.topia.persistence.csv.out; -/* - * #%L - * ToPIA :: Persistence - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2004 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -import com.google.common.base.Preconditions; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.TopiaRuntimeException; -import org.nuiton.topia.persistence.EntityVisitor; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.TopiaEntityEnum; -import org.nuiton.util.TimeLog; - -import java.util.Collection; -import java.util.Map; - -/** - * entity visitor to export data to csv files. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 0.3 - */ -public abstract class AbstractExportEntityVisitor<T extends TopiaEntityEnum> implements EntityVisitor { - - /** Logger. */ - private static final Log log = - LogFactory.getLog(AbstractExportEntityVisitor.class); - - public static final TimeLog TIME_LOG = - new TimeLog(AbstractExportEntityVisitor.class); - - - protected abstract boolean isNoChildVisit(String propertyName, TopiaEntity entity); - - - /** Export for simple entity. */ - protected final Map<Class<?>, TopiaCsvExports.EntityExportContext> entityExporters; - - public AbstractExportEntityVisitor(Map<Class<?>, TopiaCsvExports.EntityExportContext> entityExporters) { - this.entityExporters = entityExporters; - } - - public void export(TopiaEntity entity) { - Preconditions.checkNotNull(entity); - long s1 = TimeLog.getTime(); - try { - entity.accept(this); - } catch (TopiaException e) { - throw new TopiaRuntimeException( - "Could not export entity " + entity.getTopiaId(), e); - } finally { - TIME_LOG.log(s1, "export::" + entity.getTopiaId()); - } - } - - @Override - public void start(TopiaEntity entity) { - String topiaId = entity.getTopiaId(); - try { - if (log.isDebugEnabled()) { - log.debug("Starts export of entity " + topiaId); - } - TopiaCsvExports.EntityExportContext entityExporter = - entityExporters.get(entity.getClass()); - entityExporter.write(entity); - } catch (Exception e) { - throw new TopiaRuntimeException( - "Could not export entity " + entity, e); - } finally { - if (log.isDebugEnabled()) { - log.debug("Ends export of entity " + topiaId); - } - } - } - - @Override - public void end(TopiaEntity entity) { - try { - if (log.isDebugEnabled()) { - log.debug("Starts export of association of entity " + - entity.getTopiaId()); - } - TopiaCsvExports.EntityExportContext entityExporter = - entityExporters.get(entity.getClass()); - entityExporter.writeAssociations(entity); - } catch (Exception e) { - throw new TopiaRuntimeException( - "Could not export associations of entity " + entity, e); - } finally { - if (log.isDebugEnabled()) { - log.debug("Ends export of association of entity " + - entity.getTopiaId()); - } - } - } - - @Override - public void visit(TopiaEntity entity, String propertyName, - Class<?> type, Object value) { - } - - @Override - public void visit(TopiaEntity entity, - String propertyName, - Class<?> collectionType, - Class<?> type, - Object value) { - - if (TopiaEntity.class.isAssignableFrom(type) && - entityExporters.containsKey(type)) { - Collection<?> cValue = (Collection<?>) value; - - if (CollectionUtils.isNotEmpty(cValue)) { - - if (isNoChildVisit(propertyName, entity) && - Entity2.class.isAssignableFrom(type)) { - - // special case, when visiting a entity with no child - // visisting at this time... - for (Object currentValue : cValue) { - ((Entity2) currentValue).accept2(this); - } - } else { - for (Object currentValue : cValue) { - try { - ((TopiaEntity) currentValue).accept(this); - } catch (TopiaException e) { - if (log.isErrorEnabled()) { - log.error("Can not visit entity " + value, e); - } - } - } - } - } - } - } - - @Override - public void visit(TopiaEntity entity, - String propertyName, - Class<?> collectionType, Class<?> type, - int index, - Object value) { - - // nothing to do - } - - @Override - public void clear() { - - // use at the end of visit (or later) - - for (TopiaCsvExports.EntityExportContext exportContext : entityExporters.values()) { - IOUtils.closeQuietly(exportContext); - } - } -} Copied: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java (from rev 2627, branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/AbstractExportEntityVisitor.java) =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java (rev 0) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java 2012-08-18 10:02:32 UTC (rev 2630) @@ -0,0 +1,200 @@ +package org.nuiton.topia.persistence.csv.out; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +import com.google.common.base.Preconditions; +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.persistence.EntityVisitor; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityEnum; +import org.nuiton.topia.persistence.metadata.TopiaEntityEnumProvider; +import org.nuiton.util.TimeLog; + +import java.io.Closeable; +import java.io.IOException; +import java.util.Collection; +import java.util.Map; + +/** + * Entity visitor to export data to csv files. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.3 + */ +public class ExportEntityVisitor<T extends TopiaEntityEnum> implements EntityVisitor, Closeable { + + /** Logger. */ + private static final Log log = LogFactory.getLog(ExportEntityVisitor.class); + + public static final TimeLog TIME_LOG = + new TimeLog(ExportEntityVisitor.class); + + /** Export for simple entity. */ + protected final Map<T, TopiaCsvExports.EntityExportContext<T>> entityExporters; + + protected final TopiaEntityEnumProvider<T> entityEnumProvider; + + public ExportEntityVisitor(TopiaEntityEnumProvider<T> entityEnumProvider, Map<T, TopiaCsvExports.EntityExportContext<T>> entityExporters) { + this.entityEnumProvider = entityEnumProvider; + this.entityExporters = entityExporters; + } + + public void export(TopiaEntity entity) { + Preconditions.checkNotNull(entity); + long s1 = TimeLog.getTime(); + try { + entity.accept(this); + } catch (TopiaException e) { + throw new TopiaRuntimeException( + "Could not export entity " + entity.getTopiaId(), e); + } finally { + TIME_LOG.log(s1, "export::" + entity.getTopiaId()); + } + } + + @Override + public void start(TopiaEntity entity) { + String topiaId = entity.getTopiaId(); + try { + if (log.isDebugEnabled()) { + log.debug("Starts export of entity " + topiaId); + } + TopiaCsvExports.EntityExportContext entityExporter = + getEntityContext(entity.getClass()); + Preconditions.checkNotNull(entityExporter); + entityExporter.write(entity); + } catch (Exception e) { + throw new TopiaRuntimeException( + "Could not export entity " + entity, e); + } finally { + if (log.isDebugEnabled()) { + log.debug("Ends export of entity " + topiaId); + } + } + } + + @Override + public void end(TopiaEntity entity) { + try { + if (log.isDebugEnabled()) { + log.debug("Starts export of association of entity " + + entity.getTopiaId()); + } + TopiaCsvExports.EntityExportContext entityExporter = + getEntityContext(entity.getClass()); + Preconditions.checkNotNull(entityExporter); + entityExporter.writeAssociations(entity); + } catch (Exception e) { + throw new TopiaRuntimeException( + "Could not export associations of entity " + entity, e); + } finally { + if (log.isDebugEnabled()) { + log.debug("Ends export of association of entity " + + entity.getTopiaId()); + } + } + } + + + @Override + public void visit(TopiaEntity entity, String propertyName, + Class<?> type, Object value) { + } + + @Override + public void visit(TopiaEntity entity, + String propertyName, + Class<?> collectionType, + Class<?> type, + Object value) { + + if (TopiaEntity.class.isAssignableFrom(type) && + getEntityContext(type) != null) { + Collection<?> cValue = (Collection<?>) value; + + if (CollectionUtils.isNotEmpty(cValue)) { + + if (isNoChildVisit(propertyName, entity) && + Entity2.class.isAssignableFrom(type)) { + + // special case, when visiting a entity with no child + // visisting at this time... + for (Object currentValue : cValue) { + ((Entity2) currentValue).accept2(this); + } + } else { + for (Object currentValue : cValue) { + try { + ((TopiaEntity) currentValue).accept(this); + } catch (TopiaException e) { + if (log.isErrorEnabled()) { + log.error("Can not visit entity " + value, e); + } + } + } + } + } + } + } + + @Override + public void visit(TopiaEntity entity, + String propertyName, + Class<?> collectionType, Class<?> type, + int index, + Object value) { + + // nothing to do + } + + @Override + public void close() throws IOException { + + // use at the end of visit (or later) + + for (TopiaCsvExports.EntityExportContext<T> exportContext : entityExporters.values()) { + exportContext.close(); + } + } + + @Override + public void clear() { + // prefer use the close api + } + + protected TopiaCsvExports.EntityExportContext getEntityContext(Class<?> entityType) { + T entityEnum = entityEnumProvider.getEntityEnum(entityType); + return entityEnum == null ? null : entityExporters.get(entityEnum); + } + + protected boolean isNoChildVisit(String propertyName, TopiaEntity entity) { + + // by default accept all associations + return false; + } +} Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportEntityVisitor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java 2012-08-18 09:57:33 UTC (rev 2629) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java 2012-08-18 10:02:32 UTC (rev 2630) @@ -150,24 +150,21 @@ return Export.newExport(model, datas); } - public static <T extends TopiaEntityEnum> Map<Class<?>, EntityExportContext> createReplicateEntityVisitorContexts(ExportModelFactory<T> modelFactory, - MetaFilenameAware<T>[] entityMetas, - Multimap<T, MetaFilenameAware<T>> associations, - File container) { + public static <T extends TopiaEntityEnum> Map<T, EntityExportContext<T>> createReplicateEntityVisitorContexts(ExportModelFactory<T> modelFactory, + MetaFilenameAware<T>[] entityMetas, + Multimap<T, MetaFilenameAware<T>> associations, + File container) { Preconditions.checkNotNull(modelFactory); Preconditions.checkNotNull(entityMetas); Preconditions.checkNotNull(associations); Preconditions.checkNotNull(container); - Map<Class<?>, EntityExportContext> contexts = Maps.newHashMap(); + Map<T, EntityExportContext<T>> contexts = Maps.newHashMap(); for (MetaFilenameAware<T> entityMeta : entityMetas) { TableMeta<T> meta = (TableMeta<T>) entityMeta; - T source = meta.getSource(); - Collection<MetaFilenameAware<T>> metaFilenameAwares = associations.get(source); - ExportModel<TopiaEntity> model = modelFactory.buildForExport(meta); EntityExportContext<T> exportContext = EntityExportContext.newExportContext( @@ -175,13 +172,14 @@ meta, container); - // save both for contract and implementation with same context - contexts.put(source.getContract(), exportContext); - contexts.put(source.getImplementation(), exportContext); + T source = meta.getSource(); - for (MetaFilenameAware<T> metaFilenameAware : metaFilenameAwares) { - AssociationMeta<T> associationMeta = (AssociationMeta<T>) metaFilenameAware; + contexts.put(source, exportContext); + for (MetaFilenameAware<T> metaFilenameAware : associations.get(source)) { + AssociationMeta<T> associationMeta = + (AssociationMeta<T>) metaFilenameAware; + ExportModel<TopiaEntity> associationModel = modelFactory.buildForExport(associationMeta); exportContext.addAssociationExportContext(associationMeta, @@ -224,8 +222,7 @@ public static <T extends TopiaEntityEnum> EntityExportContext<T> newExportContext( ExportModel<TopiaEntity> model, TableMeta<T> meta, - File container - ) { + File container) { return new EntityExportContext<T>(model, meta, container); }

1 0

r2629 - branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata
by tchemit＠users.nuiton.org 18 Aug '12

18 Aug '12

Author: tchemit Date: 2012-08-18 11:57:33 +0200 (Sat, 18 Aug 2012) New Revision: 2629 Url: http://nuiton.org/repositories/revision/topia/2629 Log: refs #2260: Add a metadata package in persistence (improve api) Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java 2012-08-17 13:58:26 UTC (rev 2628) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/DbMeta.java 2012-08-18 09:57:33 UTC (rev 2629) @@ -47,10 +47,13 @@ /** All types non editables. */ protected final Set<T> nonEditableTypes; - public static <T extends TopiaEntityEnum> DbMeta<T> newDbMeta(T[] universe, - T[] nonEditables, - TopiaEntityEnumProvider<T> typeProvider) { - return new DbMeta<T>(universe, nonEditables, typeProvider); + protected final TopiaEntityEnumProvider<T> entityEnumProvider; + + public static <T extends TopiaEntityEnum> DbMeta<T> newDbMeta( + TopiaEntityEnumProvider<T> typeProvider, + T[] universe, + T... nonEditables) { + return new DbMeta<T>(typeProvider, universe, nonEditables); } public List<String> getTableNames() { @@ -82,11 +85,14 @@ return getTables().iterator(); } - protected DbMeta(T[] entityTypes, T[] nonEditableTypes, TopiaEntityEnumProvider<T> typeProvider) { + protected DbMeta(TopiaEntityEnumProvider<T> entityEnumProvider, + T[] entityTypes, + T... nonEditableTypes) { + this.entityEnumProvider = entityEnumProvider; this.nonEditableTypes = Sets.newHashSet(nonEditableTypes); tables = Lists.newArrayList(); for (T entityEnum : entityTypes) { - TableMeta<T> tableMeta = TableMeta.newMeta(entityEnum, typeProvider); + TableMeta<T> tableMeta = TableMeta.newMeta(entityEnum, entityEnumProvider); tables.add(tableMeta); } } @@ -94,4 +100,8 @@ public boolean isEditable(TableMeta<T> meta) { return !nonEditableTypes.contains(meta.getSource()); } + + public TopiaEntityEnumProvider<T> getEntityEnumProvider() { + return entityEnumProvider; + } } Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java 2012-08-17 13:58:26 UTC (rev 2628) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/Metadatas.java 2012-08-18 09:57:33 UTC (rev 2629) @@ -31,7 +31,7 @@ import java.util.List; /** - * USeful methods around metadatas. + * Useful methods around metadatas. * * @author tchemit <chemit(a)codelutin.com> * @since 2.6.12 Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java 2012-08-17 13:58:26 UTC (rev 2628) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/TableMeta.java 2012-08-18 09:57:33 UTC (rev 2629) @@ -57,8 +57,8 @@ private static final long serialVersionUID = 1L; - public static <T extends TopiaEntityEnum> TableMeta newMeta(T entityEnum, - TopiaEntityEnumProvider<T> typeProvider) { + public static <T extends TopiaEntityEnum> TableMeta<T> newMeta(T entityEnum, + TopiaEntityEnumProvider<T> typeProvider) { return new TableMeta<T>(entityEnum, typeProvider); }

1 0

r2628 - branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv
by tchemit＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: tchemit Date: 2012-08-17 15:58:26 +0200 (Fri, 17 Aug 2012) New Revision: 2628 Url: http://nuiton.org/repositories/revision/topia/2628 Log: refs #2266: Add some api about import / export in csv format (can import/export enum) Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java 2012-08-17 09:17:17 UTC (rev 2627) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java 2012-08-17 13:58:26 UTC (rev 2628) @@ -29,6 +29,7 @@ import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.TopiaId; import org.nuiton.topia.persistence.metadata.TableMeta; +import org.nuiton.util.csv.ValueParserFormatter; import org.nuiton.util.csv.ext.AbstractImportExportModel; import org.nuiton.util.decorator.Decorator; @@ -47,6 +48,8 @@ protected final TableMeta<T> tableMeta; + protected boolean useOrdinalForEnum; + public static <T extends TopiaEntityEnum, E extends TopiaEntity> EntityCsvModel<T, E> newModel( char separator, TableMeta<T> tableMeta) { @@ -65,16 +68,19 @@ return (E) tableMeta.newEntity(); } + public void setUseOrdinalForEnum(boolean useOrdinalForEnum) { + this.useOrdinalForEnum = useOrdinalForEnum; + } + public void addForeignKeyForExport(String propertyName, Class<TopiaEntity> entityType) { Map<String, TopiaEntity> universe = Collections.emptyMap(); - newColumnForExport( - propertyName, - TopiaCsvCommons.newForeignKeyValue(entityType, - propertyName, - universe) + newColumnForExport(propertyName, + TopiaCsvCommons.newForeignKeyValue(entityType, + propertyName, + universe) ); } @@ -95,12 +101,11 @@ Map<String, E> universe = Maps.uniqueIndex(entities, transform); - newMandatoryColumn( - headerName, - propertyName, - TopiaCsvCommons.newForeignKeyValue(entityType, - propertyName, - universe) + newMandatoryColumn(headerName, + propertyName, + TopiaCsvCommons.newForeignKeyValue(entityType, + propertyName, + universe) ); } @@ -128,11 +133,10 @@ Map<String, E> universe = Maps.uniqueIndex(entities, TopiaId.GET_TOPIA_ID); - newMandatoryColumn( - propertyName, - TopiaCsvCommons.newForeignKeyValue(entityType, - propertyName, - universe) + newMandatoryColumn(propertyName, + TopiaCsvCommons.newForeignKeyValue(entityType, + propertyName, + universe) ); } @@ -148,75 +152,82 @@ newColumnForImportExport( headerName, propertyName, - TopiaCsvCommons.DAY_TIME_SECOND_WITH_TIMESTAMP - ); + TopiaCsvCommons.DAY_TIME_SECOND_WITH_TIMESTAMP); } else if (double.class.equals(type)) { newColumnForImportExport( headerName, propertyName, - TopiaCsvCommons.DOUBLE_PRIMITIVE - ); + TopiaCsvCommons.DOUBLE_PRIMITIVE); } else if (Double.class.equals(type)) { newColumnForImportExport( headerName, propertyName, - TopiaCsvCommons.DOUBLE - ); + TopiaCsvCommons.DOUBLE); } else if (long.class.equals(type)) { newColumnForImportExport( headerName, propertyName, - TopiaCsvCommons.PRIMITIVE_LONG - ); + TopiaCsvCommons.PRIMITIVE_LONG); } else if (Long.class.equals(type)) { newColumnForImportExport( headerName, propertyName, - TopiaCsvCommons.LONG - ); + TopiaCsvCommons.LONG); } else if (float.class.equals(type)) { newColumnForImportExport( headerName, propertyName, - TopiaCsvCommons.PRIMITIVE_FLOAT - ); + TopiaCsvCommons.PRIMITIVE_FLOAT); } else if (Float.class.equals(type)) { newColumnForImportExport( headerName, propertyName, - TopiaCsvCommons.FLOAT - ); + TopiaCsvCommons.FLOAT); } else if (int.class.equals(type)) { newColumnForImportExport( headerName, propertyName, - TopiaCsvCommons.PRIMITIVE_INTEGER - ); + TopiaCsvCommons.PRIMITIVE_INTEGER); } else if (Integer.class.equals(type)) { newColumnForImportExport( headerName, propertyName, - TopiaCsvCommons.INTEGER - ); + TopiaCsvCommons.INTEGER); } else if (boolean.class.equals(type)) { newColumnForImportExport( headerName, propertyName, - TopiaCsvCommons.PRIMITIVE_BOOLEAN - ); + TopiaCsvCommons.PRIMITIVE_BOOLEAN); } else if (Boolean.class.equals(type)) { newColumnForImportExport( headerName, propertyName, - TopiaCsvCommons.BOOLEAN - ); + TopiaCsvCommons.BOOLEAN); + } else if (String.class.equals(type)) { + newColumnForImportExport( + headerName, + propertyName); + } else if (type.isEnum()) { + + Class<Enum> enumType = (Class<Enum>) type; + ValueParserFormatter<Enum> valueParserFormatter; + if (useOrdinalForEnum) { + valueParserFormatter = + TopiaCsvCommons.newEnumByOrdinalParserFormatter(enumType); + } else { + valueParserFormatter = + TopiaCsvCommons.newEnumByNameParserFormatter(enumType); + } + + newColumnForImportExport(headerName, + propertyName, + valueParserFormatter); + } else { - // string - newColumnForImportExport( - headerName, - propertyName - ); + throw new IllegalStateException(String.format( + "For header %s, property %s, no specific handler " + + "found for type %s", headerName, propertyName, type)); } }

1 0

r2627 - in branches/topia-2.6.x/topia-persistence/src: main/java/org/nuiton/topia/persistence/csv main/java/org/nuiton/topia/persistence/csv/in main/java/org/nuiton/topia/persistence/csv/out main/java/org/nuiton/topia/persistence/metadata test/java/org/nuiton/topia/persistence
by tchemit＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: tchemit Date: 2012-08-17 11:17:17 +0200 (Fri, 17 Aug 2012) New Revision: 2627 Url: http://nuiton.org/repositories/revision/topia/2627 Log: add missing headers + svn properties Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvFileImportResult.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvImportResult.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/package-info.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/AbstractExportEntityVisitor.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/Entity2.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/package-info.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/package-info.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -3,7 +3,7 @@ * #%L * ToPIA :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -3,7 +3,7 @@ * #%L * ToPIA :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -3,7 +3,7 @@ * EchoBase :: Entities * * $Id$ - * $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-entities/src/mai… $ + * $HeadURL$ * %% * Copyright (C) 2011 - 2012 Ifremer, Codelutin * %% Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvFileImportResult.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvFileImportResult.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvFileImportResult.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -3,7 +3,7 @@ * #%L * ToPIA :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvFileImportResult.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvImportResult.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvImportResult.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvImportResult.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -3,7 +3,7 @@ * #%L * ToPIA :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/CsvImportResult.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -3,7 +3,7 @@ * #%L * ToPIA :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -3,7 +3,7 @@ * #%L * ToPIA :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -3,7 +3,7 @@ * #%L * ToPIA :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/package-info.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/AbstractExportEntityVisitor.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/AbstractExportEntityVisitor.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/AbstractExportEntityVisitor.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -3,7 +3,7 @@ * #%L * ToPIA :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/AbstractExportEntityVisitor.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/Entity2.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/Entity2.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/Entity2.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -3,7 +3,7 @@ * #%L * ToPIA :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/Entity2.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -3,7 +3,7 @@ * #%L * ToPIA :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -3,7 +3,7 @@ * #%L * ToPIA :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -1,4 +1,27 @@ package org.nuiton.topia.persistence.csv.out; +/* + * #%L + * ToPIA :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -3,7 +3,7 @@ * #%L * ToPIA :: Persistence * $Id$ - * $HeadURL:$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/package-info.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/package-info.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/metadata/package-info.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java 2012-08-17 08:47:17 UTC (rev 2626) +++ branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java 2012-08-17 09:17:17 UTC (rev 2627) @@ -1,8 +1,8 @@ /* * #%L * ToPIA :: Persistence :: Test Compatibility Kit - * $Id: IsPersistentTest.java 2570 2012-05-31 10:46:40Z athimel $ - * $HeadURL: http://svn.nuiton.org/svn/topia/trunk/topia-persistence-tck/src/test/java/o… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2004 - 2012 CodeLutin * %% Property changes on: branches/topia-2.6.x/topia-persistence/src/test/java/org/nuiton/topia/persistence/TopiaContextFindTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2626 - in trunk: src/site topia-persistence/src/site topia-service-migration/src/site topia-service-replication/src/site topia-service-security/src/site
by tchemit＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: tchemit Date: 2012-08-17 10:47:17 +0200 (Fri, 17 Aug 2012) New Revision: 2626 Url: http://nuiton.org/repositories/revision/topia/2626 Log: fix site scm metadata + site logos Modified: trunk/src/site/site_fr.xml trunk/topia-persistence/src/site/site_fr.xml trunk/topia-service-migration/src/site/site_fr.xml trunk/topia-service-replication/src/site/site_fr.xml trunk/topia-service-security/src/site/site_fr.xml Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-08-17 08:46:50 UTC (rev 2625) +++ trunk/src/site/site_fr.xml 2012-08-17 08:47:17 UTC (rev 2626) @@ -57,17 +57,17 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${project.url}/images/logos/maven-feather.png"/> + img="http://maven-site.chorem.org/public/images/logos/maven-feather.png"/> <logo href="http://maven-site.nuiton.org/jrst/" name="JRst" - img="${project.url}/images/jrst-logo.png"/> + img="http://maven-site.chorem.org/public/images/logos/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${project.url}/images/restructuredtext-logo.png"/> + img="http://maven-site.chorem.org/public/images/logos/restructuredtext-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="images/argouml-logo.png"/> + img="http://maven-site.chorem.org/public/images/logos/argouml-logo.png"/> </poweredBy> <body> @@ -101,7 +101,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/topia-persistence/src/site/site_fr.xml =================================================================== --- trunk/topia-persistence/src/site/site_fr.xml 2012-08-17 08:46:50 UTC (rev 2625) +++ trunk/topia-persistence/src/site/site_fr.xml 2012-08-17 08:47:17 UTC (rev 2626) @@ -93,7 +93,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/topia-service-migration/src/site/site_fr.xml =================================================================== --- trunk/topia-service-migration/src/site/site_fr.xml 2012-08-17 08:46:50 UTC (rev 2625) +++ trunk/topia-service-migration/src/site/site_fr.xml 2012-08-17 08:47:17 UTC (rev 2626) @@ -65,7 +65,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/topia-service-replication/src/site/site_fr.xml =================================================================== --- trunk/topia-service-replication/src/site/site_fr.xml 2012-08-17 08:46:50 UTC (rev 2625) +++ trunk/topia-service-replication/src/site/site_fr.xml 2012-08-17 08:47:17 UTC (rev 2626) @@ -62,7 +62,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}' Modified: trunk/topia-service-security/src/site/site_fr.xml =================================================================== --- trunk/topia-service-security/src/site/site_fr.xml 2012-08-17 08:46:50 UTC (rev 2625) +++ trunk/topia-service-security/src/site/site_fr.xml 2012-08-17 08:47:17 UTC (rev 2626) @@ -69,7 +69,7 @@ projectversion='${project.version}' platform='${project.platform}' projectid='${project.projectId}' - scm='${project.scm.connection}' + scm='${project.scm.developerConnection}' scmwebeditorenabled='${project.scmwebeditorEnabled}' scmwebeditorurl='${project.scmwebeditorUrl}' siteSourcesType='${project.siteSourcesType}'

1 0

r2625 - in trunk: . topia-persistence-tck topia-service-security
by tchemit＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: tchemit Date: 2012-08-17 10:46:50 +0200 (Fri, 17 Aug 2012) New Revision: 2625 Url: http://nuiton.org/repositories/revision/topia/2625 Log: refs #2269: Updates to eugene 2.6 Modified: trunk/pom.xml trunk/topia-persistence-tck/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-17 08:46:01 UTC (rev 2624) +++ trunk/pom.xml 2012-08-17 08:46:50 UTC (rev 2625) @@ -68,7 +68,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.4.3-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.6-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> <processorPluginVersion>1.2.2</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> Modified: trunk/topia-persistence-tck/pom.xml =================================================================== --- trunk/topia-persistence-tck/pom.xml 2012-08-17 08:46:01 UTC (rev 2624) +++ trunk/topia-persistence-tck/pom.xml 2012-08-17 08:46:50 UTC (rev 2625) @@ -100,7 +100,7 @@ <defaultPackage>org.nuiton.topia.tck</defaultPackage> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -122,7 +122,7 @@ <defaultPackage>org.nuiton.topia.tck.it</defaultPackage> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -144,7 +144,7 @@ <defaultPackage>org.nuiton.topia.tck.legacy</defaultPackage> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> <execution> @@ -161,7 +161,7 @@ <defaultPackage>org.nuiton.topia.tck.mapping</defaultPackage> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2012-08-17 08:46:01 UTC (rev 2624) +++ trunk/topia-service-security/pom.xml 2012-08-17 08:46:50 UTC (rev 2625) @@ -141,7 +141,7 @@ <overwrite>true</overwrite> </configuration> <goals> - <goal>smart-generate</goal> + <goal>generate</goal> </goals> </execution> </executions>

1 0

r2624 - trunk/src/site/resources
by tchemit＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: tchemit Date: 2012-08-17 10:46:01 +0200 (Fri, 17 Aug 2012) New Revision: 2624 Url: http://nuiton.org/repositories/revision/topia/2624 Log: remove site resources Removed: trunk/src/site/resources/images/

1 0

r2623 - branches/topia-2.6.x
by tchemit＠users.nuiton.org 17 Aug '12

17 Aug '12

Author: tchemit Date: 2012-08-17 10:22:12 +0200 (Fri, 17 Aug 2012) New Revision: 2623 Url: http://nuiton.org/repositories/revision/topia/2623 Log: fixes #2256: updates to eugene 2.5 Modified: branches/topia-2.6.x/pom.xml Modified: branches/topia-2.6.x/pom.xml =================================================================== --- branches/topia-2.6.x/pom.xml 2012-08-16 22:43:00 UTC (rev 2622) +++ branches/topia-2.6.x/pom.xml 2012-08-17 08:22:12 UTC (rev 2623) @@ -59,7 +59,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.5-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.5</eugeneVersion> <nuitonUtilsVersion>2.6-SNAPSHOT</nuitonUtilsVersion> <processorPluginVersion>1.2.2</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion>

1 0

r2622 - branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out
by tchemit＠users.nuiton.org 16 Aug '12

16 Aug '12

Author: tchemit Date: 2012-08-17 00:43:00 +0200 (Fri, 17 Aug 2012) New Revision: 2622 Url: http://nuiton.org/repositories/revision/topia/2622 Log: refs #2266: Add some api about import / export in csv format (add useful export methods) Added: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java 2012-08-16 16:19:17 UTC (rev 2621) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java 2012-08-16 22:43:00 UTC (rev 2622) @@ -37,7 +37,7 @@ */ public interface ExportModelFactory<T extends TopiaEntityEnum> { - <E extends TopiaEntity> ExportModel<E> buildForExport(TableMeta<T> meta, boolean asSeen); + <E extends TopiaEntity> ExportModel<E> buildForExport(TableMeta<T> meta); <E extends TopiaEntity> ExportModel<E> buildForExport(AssociationMeta<T> associationMeta); } Added: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java (rev 0) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java 2012-08-16 22:43:00 UTC (rev 2622) @@ -0,0 +1,21 @@ +package org.nuiton.topia.persistence.csv.out; + +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityEnum; +import org.nuiton.topia.persistence.metadata.AssociationMeta; +import org.nuiton.topia.persistence.metadata.TableMeta; + +import java.util.List; + +/** + * Prepare data to export. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.6.12 + */ +public interface PrepareDataForExport<T extends TopiaEntityEnum> { + + <E extends TopiaEntity> List<E> prepareData(TableMeta<T> tableMeta); + + <E extends TopiaEntity> List<E> prepareData(AssociationMeta<T> associationMeta); +} Property changes on: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/PrepareDataForExport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java =================================================================== --- branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java 2012-08-16 16:19:17 UTC (rev 2621) +++ branches/topia-2.6.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java 2012-08-16 22:43:00 UTC (rev 2622) @@ -23,6 +23,7 @@ * #L% */ +import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -31,11 +32,14 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.MetaFilenameAware; import org.nuiton.topia.persistence.metadata.TableMeta; +import org.nuiton.util.TimeLog; +import org.nuiton.util.csv.Export; import org.nuiton.util.csv.ExportModel; import org.nuiton.util.csv.ext.RepeatableExport; @@ -58,10 +62,94 @@ /** Logger. */ private static final Log log = LogFactory.getLog(TopiaCsvExports.class); + + public static final TimeLog TIME_LOG = new TimeLog(TopiaCsvExports.class); + + protected TopiaCsvExports() { // no instance of this helper } + public static <T extends TopiaEntityEnum> String exportData(TableMeta<T> tableMeta, + ExportModelFactory<T> modelFactory, + PrepareDataForExport<T> prepareDataForExport) { + + + long s1 = TimeLog.getTime(); + Export<TopiaEntity> export = prepareExport(tableMeta, modelFactory, prepareDataForExport); + TIME_LOG.log(s1, "exportData::prepareExport"); + long s2 = TimeLog.getTime(); + String result; + try { + result = export.toString(Charsets.UTF_8); + } catch (Exception eee) { + throw new TopiaRuntimeException("Can not export datas", eee); + } + TIME_LOG.log(s2, "exportData::exportToString"); + return result; + } + + public static <T extends TopiaEntityEnum> void exportData(TableMeta<T> tableMeta, + ExportModelFactory<T> modelFactory, + PrepareDataForExport<T> prepareDataForExport, + File file) { + + if (log.isInfoEnabled()) { + log.info("Export table " + tableMeta + " to " + file); + } + long s1 = TimeLog.getTime(); + Export<TopiaEntity> export = prepareExport(tableMeta, modelFactory, prepareDataForExport); + TIME_LOG.log(s1, "exportDatas::prepareExport"); + long s2 = TimeLog.getTime(); + try { + export.write(file, Charsets.UTF_8); + } catch (Exception eee) { + throw new TopiaRuntimeException("Can not export datas", eee); + } + TIME_LOG.log(s2, "exportData::exportToFile"); + } + + public static <T extends TopiaEntityEnum> void exportData(AssociationMeta<T> associationMeta, + ExportModelFactory<T> modelFactory, + PrepareDataForExport<T> prepareDataForExport, + File file) { + + if (log.isInfoEnabled()) { + log.info("Export association " + associationMeta + " to " + file); + } + long s1 = TimeLog.getTime(); + + Export<TopiaEntity> export = prepareExport(associationMeta, modelFactory, prepareDataForExport); + TIME_LOG.log(s1, "exportData::prepareExport"); + + long s2 = TimeLog.getTime(); + try { + export.write(file, Charsets.UTF_8); + } catch (Exception eee) { + throw new TopiaRuntimeException("Can not export datas", eee); + } + TIME_LOG.log(s2, "exportData::exportToFile"); + } + + public static <T extends TopiaEntityEnum, E extends TopiaEntity> Export<E> prepareExport(TableMeta<T> tableMeta, + ExportModelFactory<T> modelFactory, + PrepareDataForExport<T> prepareDataForExport) { + + + List<E> datas = prepareDataForExport.prepareData(tableMeta); + ExportModel<E> model = modelFactory.buildForExport(tableMeta); + return Export.newExport(model, datas); + } + + public static <T extends TopiaEntityEnum, E extends TopiaEntity> Export<E> prepareExport(AssociationMeta<T> associationMeta, + ExportModelFactory<T> modelFactory, + PrepareDataForExport<T> prepareDataForExport) { + + List<E> datas = prepareDataForExport.prepareData(associationMeta); + ExportModel<E> model = modelFactory.buildForExport(associationMeta); + return Export.newExport(model, datas); + } + public static <T extends TopiaEntityEnum> Map<Class<?>, EntityExportContext> createReplicateEntityVisitorContexts(ExportModelFactory<T> modelFactory, MetaFilenameAware<T>[] entityMetas, Multimap<T, MetaFilenameAware<T>> associations, @@ -80,7 +168,7 @@ Collection<MetaFilenameAware<T>> metaFilenameAwares = associations.get(source); - ExportModel<TopiaEntity> model = modelFactory.buildForExport(meta, false); + ExportModel<TopiaEntity> model = modelFactory.buildForExport(meta); EntityExportContext<T> exportContext = EntityExportContext.newExportContext( model,

1 0