[Git][ultreiaio/ird-observe][master-5.x] 7 commits: [jgitflow-maven-plugin]updating poms for 5.3.7-SNAPSHOT development

29 Mar 2017

Tony CHEMIT pushed to branch master-5.x at ultreiaio / ird-observe


Commits:
373c9219 by Tony CHEMIT at 2017-03-22T08:02:38+01:00
[jgitflow-maven-plugin]updating poms for 5.3.7-SNAPSHOT development
- - - - -
fb98ce76 by Tony CHEMIT at 2017-03-22T08:09:13+01:00
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts
- - - - -
efe6ea8e by Tony CHEMIT at 2017-03-22T08:09:14+01:00
[jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x'
- - - - -
cb3e4bbe by Tony CHEMIT at 2017-03-22T08:09:15+01:00
[jgitflow-maven-plugin]Updating develop poms back to pre merge state
- - - - -
a628cf8b by Tony CHEMIT at 2017-03-29T16:38:17+02:00
Correction de la génération des script d'import entre deux bases distantes (see #758)

- - - - -
ff09e3b4 by Tony CHEMIT at 2017-03-29T16:40:29+02:00
[jgitflow-maven-plugin]updating poms for branch'release/5.3.7' with non-snapshot versions
- - - - -
88829e6a by Tony CHEMIT at 2017-03-29T16:50:13+02:00
[jgitflow-maven-plugin]merging 'release/5.3.7' into 'master-5.x'
- - - - -


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-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java
- 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/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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</version>
   </parent>
 
   <artifactId>application-swing</artifactId>


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java
@@ -31,31 +31,20 @@ import fr.ird.observe.application.swing.ui.admin.AdminTabUI;
 import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler;
 import fr.ird.observe.application.swing.ui.admin.AdminUI;
 import fr.ird.observe.application.swing.ui.admin.config.ConfigUI;
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.CopyToLeftDataSynchronizeTask;
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.CopyToRightDataSynchronizeTask;
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DataSynchronizeTaskSupport;
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFromLeftDataSynchronizeTask;
-import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFromRightDataSynchronizeTask;
+import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.*;
 import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel;
 import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper;
-import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.referential.ProgramDto;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
-import fr.ird.observe.services.service.trip.DeleteTripRequest;
-import fr.ird.observe.services.service.trip.DeleteTripResult;
-import fr.ird.observe.services.service.trip.ExportTripRequest;
-import fr.ird.observe.services.service.trip.ExportTripResult;
-import fr.ird.observe.services.service.trip.ImportTripRequest;
-import fr.ird.observe.services.service.trip.ImportTripResult;
-import fr.ird.observe.services.service.trip.TripManagementService;
+import fr.ird.observe.services.service.trip.*;
 import jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import javax.swing.DefaultListModel;
+import javax.swing.*;
 import javax.swing.border.TitledBorder;
-import java.awt.Color;
+import java.awt.*;
 import java.util.List;
 import java.util.Map;
 
@@ -268,10 +257,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler {
     private WizardState doExecuteAction0() {
 
         ObserveSwingDataSource leftSource = getStepModel().getLeftSource();
-        boolean leftSourceIsPG = leftSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG;
-
         ObserveSwingDataSource rightSource = getStepModel().getRightSource();
-        boolean rightSourceIsPG = rightSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG;
 
         DefaultListModel<DataSynchronizeTaskSupport> tasks = getStepModel().getTasks();
         int size = tasks.size();
@@ -328,7 +314,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler {
 
                 sendMessage(t("observe.actions.synchro.data.prepare.copyToLeftTask", programStr, tripStr));
 
-                ExportTripRequest exportTripRequest = new ExportTripRequest(rightSourceIsPG, programId, tripId);
+                ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), programId, tripId);
                 ExportTripResult exportTripResult = rightTripManagementService.exportTrip(exportTripRequest);
                 logExportResult(n("observe.actions.synchro.data.result.export.right.trip"),
                                 exportTripResult,
@@ -352,7 +338,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler {
 
                 sendMessage(t("observe.actions.synchro.data.prepare.copyToRightTask", programStr, tripStr));
 
-                ExportTripRequest exportTripRequest = new ExportTripRequest(leftSourceIsPG, programId, tripId);
+                ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), programId, tripId);
                 ExportTripResult exportTripResult = leftTripManagementService.exportTrip(exportTripRequest);
                 logExportResult(n("observe.actions.synchro.data.result.export.left.trip"),
                                 exportTripResult,


=====================================
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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+  <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</version>
   </parent>
 
   <artifactId>services-topia</artifactId>


=====================================
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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</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.6</version>
+    <version>5.3.7</version>
   </parent>
 
   <artifactId>topia-templates-extension</artifactId>



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bca9fe1a059295ca184f10d632f...

    

Tony CHEMIT

tags

participants (1)