Author: athimel Date: 2014-04-03 17:28:03 +0200 (Thu, 03 Apr 2014) New Revision: 3040 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3040 Log: Update versions on 2.8.1.x branch Modified: branches/topia-2.8.1.x/pom.xml branches/topia-2.8.1.x/topia-persistence/pom.xml branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java Modified: branches/topia-2.8.1.x/pom.xml =================================================================== --- branches/topia-2.8.1.x/pom.xml 2014-04-03 14:54:06 UTC (rev 3039) +++ branches/topia-2.8.1.x/pom.xml 2014-04-03 15:28:03 UTC (rev 3040) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.11</version> + <version>5.0.5-SNAPSHOT</version> </parent> <artifactId>topia</artifactId> @@ -59,14 +59,16 @@ <projectId>topia</projectId> <!-- libs version --> - <eugeneVersion>2.6.3</eugeneVersion> - <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> + <eugeneVersion>2.7.4</eugeneVersion> + <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> + <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> + <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <processorPluginVersion>1.3</processorPluginVersion> - <nuitonI18nVersion>2.5.1</nuitonI18nVersion> + <nuitonI18nVersion>3.1-SNAPSHOT</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> - <hibernateVersion>4.2.2.Final</hibernateVersion> - <sl4jVersion>1.7.5</sl4jVersion> - <h2Version>1.3.172</h2Version> + <hibernateVersion>4.2.11.Final</hibernateVersion> + <sl4jVersion>1.7.6</sl4jVersion> + <h2Version>1.3.175</h2Version> <hamcrestVersion>1.3</hamcrestVersion> <!-- i18n configuration --> @@ -124,10 +126,16 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-csv</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>${nuitonCsvVersion}</version> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + <version>${nuitonDecoratorVersion}</version> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> <version>${nuitonI18nVersion}</version> @@ -160,9 +168,9 @@ </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> - <version>3.12.1.GA</version> + <version>3.18.1-GA</version> <scope>runtime</scope> </dependency> Modified: branches/topia-2.8.1.x/topia-persistence/pom.xml =================================================================== --- branches/topia-2.8.1.x/topia-persistence/pom.xml 2014-04-03 14:54:06 UTC (rev 3039) +++ branches/topia-2.8.1.x/topia-persistence/pom.xml 2014-04-03 15:28:03 UTC (rev 3040) @@ -54,6 +54,11 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-decorator</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> @@ -108,7 +113,7 @@ </dependency> <dependency> - <groupId>javassist</groupId> + <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> </dependency> Modified: branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2014-04-03 14:54:06 UTC (rev 3039) +++ branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2014-04-03 15:28:03 UTC (rev 3040) @@ -55,8 +55,6 @@ import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; - - /*{generator option: parentheses = false}*/ /*{generator option: writeString = +}*/ @@ -140,11 +138,7 @@ generateAbstract = isGenerateAbstract(input); generateImpl = isGenerateImpl(input); - String noGenerateBooleanGetMethods = - TopiaGeneratorUtil.getDoNotGenerateBooleanGetMethods(model, input); - generateBooleanGetMethods = - StringUtils.isEmpty(noGenerateBooleanGetMethods) || - !"true".equals(noGenerateBooleanGetMethods.trim()); + generateBooleanGetMethods = TopiaGeneratorUtil.isDoNotGenerateBooleanGetMethods(model, input); if (generateInterface) { Modified: branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java =================================================================== --- branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java 2014-04-03 14:54:06 UTC (rev 3039) +++ branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java 2014-04-03 15:28:03 UTC (rev 3040) @@ -25,13 +25,14 @@ import com.google.common.base.Function; import com.google.common.collect.Maps; + +import org.nuiton.decorator.Decorator; import org.nuiton.topia.persistence.TopiaEntity; 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; +import org.nuiton.csv.ValueParserFormatter; +import org.nuiton.csv.ext.AbstractImportExportModel; import java.util.Collection; import java.util.Collections; Modified: branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java =================================================================== --- branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java 2014-04-03 14:54:06 UTC (rev 3039) +++ branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java 2014-04-03 15:28:03 UTC (rev 3040) @@ -26,14 +26,14 @@ import com.google.common.collect.Lists; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.nuiton.decorator.Decorator; import org.nuiton.topia.TopiaRuntimeException; 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 org.nuiton.util.decorator.Decorator; +import org.nuiton.csv.Common; +import org.nuiton.csv.ValueFormatter; +import org.nuiton.csv.ValueParser; +import org.nuiton.csv.ValueParserFormatter; import java.sql.Timestamp; import java.text.ParseException; Modified: branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java =================================================================== --- branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java 2014-04-03 14:54:06 UTC (rev 3039) +++ branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java 2014-04-03 15:28:03 UTC (rev 3040) @@ -37,7 +37,7 @@ * @author tchemit <chemit@codelutin.com> * @since 2.6.12 */ -public abstract class AbstractImportModel<E> extends org.nuiton.util.csv.ext.AbstractImportModel<E> { +public abstract class AbstractImportModel<E> extends org.nuiton.csv.ext.AbstractImportModel<E> { public AbstractImportModel(char separator) { super(separator); Modified: branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java =================================================================== --- branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java 2014-04-03 14:54:06 UTC (rev 3039) +++ branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java 2014-04-03 15:28:03 UTC (rev 3040) @@ -27,7 +27,7 @@ import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.csv.TopiaCsvCommons; import org.nuiton.topia.persistence.metadata.AssociationMeta; -import org.nuiton.util.csv.ImportModel; +import org.nuiton.csv.ImportModel; import java.util.Map; Modified: branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java =================================================================== --- branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java 2014-04-03 14:54:06 UTC (rev 3039) +++ branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java 2014-04-03 15:28:03 UTC (rev 3040) @@ -27,7 +27,7 @@ import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.csv.ImportModel; +import org.nuiton.csv.ImportModel; import java.util.Map; Modified: branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java =================================================================== --- branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java 2014-04-03 14:54:06 UTC (rev 3039) +++ branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java 2014-04-03 15:28:03 UTC (rev 3040) @@ -28,8 +28,8 @@ import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportToMap; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportToMap; import java.io.Reader; Modified: branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java =================================================================== --- branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java 2014-04-03 14:54:06 UTC (rev 3039) +++ branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java 2014-04-03 15:28:03 UTC (rev 3040) @@ -40,9 +40,9 @@ import org.nuiton.topia.persistence.metadata.MetaFilenameAware; import org.nuiton.topia.persistence.metadata.TableMeta; import org.nuiton.topia.persistence.util.TopiaEntityHelper; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportToMap; +import org.nuiton.csv.Import; +import org.nuiton.csv.ImportModel; +import org.nuiton.csv.ImportToMap; import java.io.File; import java.io.IOException; Modified: branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java =================================================================== --- branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java 2014-04-03 14:54:06 UTC (rev 3039) +++ branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java 2014-04-03 15:28:03 UTC (rev 3040) @@ -27,8 +27,8 @@ import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.csv.TopiaCsvCommons; -import org.nuiton.util.csv.ExportModel; -import org.nuiton.util.csv.ext.AbstractExportModel; +import org.nuiton.csv.ExportModel; +import org.nuiton.csv.ext.AbstractExportModel; /** * A model to export associations of entities into csv files. Modified: branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java =================================================================== --- branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java 2014-04-03 14:54:06 UTC (rev 3039) +++ branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java 2014-04-03 15:28:03 UTC (rev 3040) @@ -27,7 +27,7 @@ import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.metadata.AssociationMeta; import org.nuiton.topia.persistence.metadata.TableMeta; -import org.nuiton.util.csv.ExportModel; +import org.nuiton.csv.ExportModel; /** * To produce export model. Modified: branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java =================================================================== --- branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java 2014-04-03 14:54:06 UTC (rev 3039) +++ branches/topia-2.8.1.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java 2014-04-03 15:28:03 UTC (rev 3040) @@ -40,9 +40,9 @@ import org.nuiton.topia.persistence.metadata.Metadatas; 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; +import org.nuiton.csv.Export; +import org.nuiton.csv.ExportModel; +import org.nuiton.csv.ext.RepeatableExport; import java.io.Closeable; import java.io.File;