[Topia-commits] r2784 - in trunk: . topia-persistence topia-persistence/src/main/java/org/nuiton/topia/persistence/csv topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out topia-service-migration topia-service-replication topia-service-security

25 Jul 2013

Author: tchemit
Date: 2013-07-25 19:03:03 +0200 (Thu, 25 Jul 2013)
New Revision: 2784

Url: http://nuiton.org/projects/topia/repository/revisions/2784

Log:
bump to version 3.0-alpha-2-SNAPSHOT
fixes #2796: Update to nuiton-utils 2.7


Modified:
   trunk/pom.xml
   trunk/topia-persistence/pom.xml
   trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java
   trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java
   trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java
   trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java
   trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java
   trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java
   trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java
   trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java
   trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java
   trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java
   trunk/topia-service-migration/pom.xml
   trunk/topia-service-replication/pom.xml
   trunk/topia-service-security/pom.xml

Modified: trunk/pom.xml
===================================================================

--- trunk/pom.xml	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/pom.xml	2013-07-25 17:03:03 UTC (rev 2784)
@@ -37,7 +37,7 @@
   </parent>
 
   <artifactId>topia</artifactId>
-  <version>3.0-SNAPSHOT</version>
+  <version>3.0-alpha-2-SNAPSHOT</version>
 
   <modules>
     <module>topia-persistence</module>
@@ -60,8 +60,9 @@
 
     <!-- libs version -->
     <eugeneVersion>2.7</eugeneVersion>
-    <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion>
-    <nuitonUtilsCsvVersion>2.6.12.1</nuitonUtilsCsvVersion> <!-- TODO AThimel 2013/07/19 Remove as soon as nuiton-utils 2.6.13 is released -->
+    <nuitonUtilsVersion>2.7</nuitonUtilsVersion>
+    <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion>
+    <nuitonDecoratorVersion>3.0-alpha-1</nuitonDecoratorVersion>
     <nuitonI18nVersion>2.5.2</nuitonI18nVersion>
     <processorPluginVersion>1.3</processorPluginVersion>
     <xmlrpcVersion>3.1.2</xmlrpcVersion>
@@ -116,10 +117,16 @@
       <dependency>
         <groupId>org.nuiton</groupId>
         <artifactId>nuiton-csv</artifactId>
-        <version>${nuitonUtilsCsvVersion}</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>

Modified: trunk/topia-persistence/pom.xml
===================================================================
--- trunk/topia-persistence/pom.xml	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/topia-persistence/pom.xml	2013-07-25 17:03:03 UTC (rev 2784)
@@ -35,7 +35,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>topia</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-alpha-2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuiton.topia</groupId>
@@ -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>
       <scope>test</scope>

Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/EntityCsvModel.java	2013-07-25 17:03:03 UTC (rev 2784)
@@ -29,9 +29,9 @@
 import org.nuiton.topia.persistence.TopiaEntity;
 import org.nuiton.topia.persistence.TopiaEntityEnum;
 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 org.nuiton.decorator.Decorator;
 
 import java.util.Collection;
 import java.util.Collections;

Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/TopiaCsvCommons.java	2013-07-25 17:03:03 UTC (rev 2784)
@@ -29,11 +29,11 @@
 import org.nuiton.topia.TopiaException;
 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 org.nuiton.decorator.Decorator;
 
 import java.sql.Timestamp;
 import java.text.ParseException;

Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/AbstractImportModel.java	2013-07-25 17:03:03 UTC (rev 2784)
@@ -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: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/EntityAssociationImportModel.java	2013-07-25 17:03:03 UTC (rev 2784)
@@ -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: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportModelFactory.java	2013-07-25 17:03:03 UTC (rev 2784)
@@ -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: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/ImportStrategy.java	2013-07-25 17:03:03 UTC (rev 2784)
@@ -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: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/in/TopiaCsvImports.java	2013-07-25 17:03:03 UTC (rev 2784)
@@ -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: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/EntityAssociationExportModel.java	2013-07-25 17:03:03 UTC (rev 2784)
@@ -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: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/ExportModelFactory.java	2013-07-25 17:03:03 UTC (rev 2784)
@@ -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: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java
===================================================================
--- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/csv/out/TopiaCsvExports.java	2013-07-25 17:03:03 UTC (rev 2784)
@@ -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;

Modified: trunk/topia-service-migration/pom.xml
===================================================================
--- trunk/topia-service-migration/pom.xml	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/topia-service-migration/pom.xml	2013-07-25 17:03:03 UTC (rev 2784)
@@ -35,7 +35,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>topia</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-alpha-2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuiton.topia</groupId>

Modified: trunk/topia-service-replication/pom.xml
===================================================================
--- trunk/topia-service-replication/pom.xml	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/topia-service-replication/pom.xml	2013-07-25 17:03:03 UTC (rev 2784)
@@ -35,7 +35,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>topia</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-alpha-2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuiton.topia</groupId>

Modified: trunk/topia-service-security/pom.xml
===================================================================
--- trunk/topia-service-security/pom.xml	2013-07-23 16:24:25 UTC (rev 2783)
+++ trunk/topia-service-security/pom.xml	2013-07-25 17:03:03 UTC (rev 2784)
@@ -35,7 +35,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>topia</artifactId>
-    <version>3.0-SNAPSHOT</version>
+    <version>3.0-alpha-2-SNAPSHOT</version>
   </parent>
 
   <groupId>org.nuiton.topia</groupId>

    

tchemit＠users.nuiton.org