[Observe-commits] [Git][ultreia.io/ird-observe][develop-5.x] 2 commits: will replay version 5.3.3

10 Mar 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe


Commits:
fb124529 by Tony CHEMIT at 2017-03-10T16:46:07+01:00
will replay version 5.3.3

- - - - -
c9db738c by Tony CHEMIT at 2017-03-10T16:46:50+01:00
fix some type (See #744)

- - - - -


26 changed files:

- application-swing-configuration/pom.xml
- application-swing-decoration/pom.xml
- application-swing-validation/pom.xml
- application-swing-validators/pom.xml
- application-swing/pom.xml
- application-web-configuration/pom.xml
- application-web/pom.xml
- entities-migration/pom.xml
- entities/pom.xml
- observe/pom.xml
- pom.xml
- services-configuration-rest/pom.xml
- services-configuration-topia/pom.xml
- services-configuration/pom.xml
- services-dto/pom.xml
- services-rest/pom.xml
- services-runner/pom.xml
- services-topia-validation/pom.xml
- services-topia-validators/pom.xml
- services-topia/pom.xml
- services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java
- services/pom.xml
- test/pom.xml
- toolbox-maven-plugin/pom.xml
- topia-extension/pom.xml
- topia-templates-extension/pom.xml


Changes:

=====================================
application-swing-configuration/pom.xml
=====================================

--- a/application-swing-configuration/pom.xml
+++ b/application-swing-configuration/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing-configuration</artifactId>


=====================================
application-swing-decoration/pom.xml
=====================================
--- a/application-swing-decoration/pom.xml
+++ b/application-swing-decoration/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing-decoration</artifactId>


=====================================
application-swing-validation/pom.xml
=====================================
--- a/application-swing-validation/pom.xml
+++ b/application-swing-validation/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing-validation</artifactId>


=====================================
application-swing-validators/pom.xml
=====================================
--- a/application-swing-validators/pom.xml
+++ b/application-swing-validators/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing-validators</artifactId>


=====================================
application-swing/pom.xml
=====================================
--- a/application-swing/pom.xml
+++ b/application-swing/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-swing</artifactId>


=====================================
application-web-configuration/pom.xml
=====================================
--- a/application-web-configuration/pom.xml
+++ b/application-web-configuration/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-web-configuration</artifactId>


=====================================
application-web/pom.xml
=====================================
--- a/application-web/pom.xml
+++ b/application-web/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>application-web</artifactId>


=====================================
entities-migration/pom.xml
=====================================
--- a/entities-migration/pom.xml
+++ b/entities-migration/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>entities-migration</artifactId>


=====================================
entities/pom.xml
=====================================
--- a/entities/pom.xml
+++ b/entities/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>entities</artifactId>


=====================================
observe/pom.xml
=====================================
--- a/observe/pom.xml
+++ b/observe/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>observe</artifactId>


=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
   <groupId>fr.ird.observe</groupId>
   <artifactId>pom</artifactId>
-  <version>5.3.4-SNAPSHOT</version>
+  <version>5.3.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ObServe</name>


=====================================
services-configuration-rest/pom.xml
=====================================
--- a/services-configuration-rest/pom.xml
+++ b/services-configuration-rest/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-configuration-rest</artifactId>


=====================================
services-configuration-topia/pom.xml
=====================================
--- a/services-configuration-topia/pom.xml
+++ b/services-configuration-topia/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-configuration-topia</artifactId>


=====================================
services-configuration/pom.xml
=====================================
--- a/services-configuration/pom.xml
+++ b/services-configuration/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-configuration</artifactId>


=====================================
services-dto/pom.xml
=====================================
--- a/services-dto/pom.xml
+++ b/services-dto/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-dto</artifactId>


=====================================
services-rest/pom.xml
=====================================
--- a/services-rest/pom.xml
+++ b/services-rest/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-rest</artifactId>


=====================================
services-runner/pom.xml
=====================================
--- a/services-runner/pom.xml
+++ b/services-runner/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-runner</artifactId>


=====================================
services-topia-validation/pom.xml
=====================================
--- a/services-topia-validation/pom.xml
+++ b/services-topia-validation/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-topia-validation</artifactId>


=====================================
services-topia-validators/pom.xml
=====================================
--- a/services-topia-validators/pom.xml
+++ b/services-topia-validators/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-topia-validators</artifactId>


=====================================
services-topia/pom.xml
=====================================
--- a/services-topia/pom.xml
+++ b/services-topia/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>services-topia</artifactId>


=====================================
services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java
=====================================
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java
@@ -23,9 +23,9 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.legacy
  */
 
 import fr.ird.observe.ObserveEntityEnum;
-import fr.ird.observe.entities.referentiel.Gear;
-import fr.ird.observe.entities.referentiel.GearCaracteristic;
 import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
+import fr.ird.observe.services.dto.referential.GearCaracteristicDto;
+import fr.ird.observe.services.dto.referential.GearDto;
 import fr.ird.observe.services.dto.referential.OceanDto;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
@@ -161,12 +161,12 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser
                     // also remove ocean_species association
                     result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","ocean", id));
                 }
-                if (Gear.class.equals(request.getReferentialName())) {
+                if (GearDto.class.equals(request.getReferentialName())) {
 
                     // also remove gear_gearcaracteristic association
                     result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gear", id));
                 }
-                if (GearCaracteristic.class.equals(request.getReferentialName())) {
+                if (GearCaracteristicDto.class.equals(request.getReferentialName())) {
 
                     // also remove gear_gearcaracteristic association
                     result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gearcaracteristic", id));


=====================================
services/pom.xml
=====================================
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>services</artifactId>


=====================================
test/pom.xml
=====================================
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>test</artifactId>


=====================================
toolbox-maven-plugin/pom.xml
=====================================
--- a/toolbox-maven-plugin/pom.xml
+++ b/toolbox-maven-plugin/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>toolbox-maven-plugin</artifactId>


=====================================
topia-extension/pom.xml
=====================================
--- a/topia-extension/pom.xml
+++ b/topia-extension/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>topia-extension</artifactId>


=====================================
topia-templates-extension/pom.xml
=====================================
--- a/topia-templates-extension/pom.xml
+++ b/topia-templates-extension/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>pom</artifactId>
-    <version>5.3.4-SNAPSHOT</version>
+    <version>5.3.3-SNAPSHOT</version>
   </parent>
 
   <artifactId>topia-templates-extension</artifactId>



View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/beff6db191d295c3d60bb6f354...

    