[Git][ultreiaio/ird-observe][develop] 3 commits: mise à jour des dépendances (Closes #767)

13 Apr 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
1e58ee6f by Tony CHEMIT at 2017-04-13T10:16:10+02:00
mise à jour des dépendances (Closes #767)

- - - - -
35bb63fb by Tony CHEMIT at 2017-04-13T10:43:00+02:00
Mode de connexion par défaut (See #765)

- - - - -
1480d830 by Tony CHEMIT at 2017-04-13T10:43:58+02:00
Dans les UI proposant le mode de connexion, faire remonter le mode service web au dessus de connexion directe (See #766)

- - - - -


7 changed files:

- application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx
- application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx
- pom.xml


Changes:

=====================================
application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java
=====================================

--- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java
+++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java
@@ -32,8 +32,8 @@ public enum DbMode {
     USE_LOCAL,
     /** Pour creer une base locale */
     CREATE_LOCAL,
-    /** Pour utiliser une base distante */
-    USE_REMOTE,
     /** Pour utiliser une base via un serveur web distant */
-    USE_SERVER
+    USE_SERVER,
+    /** Pour utiliser une base distante */
+    USE_REMOTE
 }


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigModel.java
@@ -441,7 +441,7 @@ public class ConfigModel extends AdminActionModel {
             return;
         }
 
-        // par default, on tente d'utiliser la base distance
+        // par default, on tente d'utiliser le serveur distance
         centralSourceModel.init(ui, null);
         centralSourceModel.setCanCreateLocalService(false);
         boolean canUseLocalSource = uiModel.getOperations().contains(AdminStep.DATA_SYNCHRONIZE)
@@ -450,7 +450,7 @@ public class ConfigModel extends AdminActionModel {
         centralSourceModel.setCanUseLocalService(canUseLocalSource);
         centralSourceModel.setCanUseRemoteService(true);
         centralSourceModel.setCanUseServerService(true);
-        centralSourceModel.start(USE_REMOTE);
+        centralSourceModel.start(USE_SERVER);
 
         if (log.isDebugEnabled()) {
             centralSourceModel.removePropertyChangeListener(LOG_PROPERTY_CHANGE_LISTENER);


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java
@@ -123,7 +123,7 @@ public class StorageUIHandler implements UIHandler<StorageUI> {
                     case USE_LOCAL:
                         focusOwner = ui.getCHOOSE_DB_MODE().getUseLocalMode();
                         if (!focusOwner.isEnabled()) {
-                            focusOwner = ui.getCHOOSE_DB_MODE().getUseRemoteMode();
+                            focusOwner = ui.getCHOOSE_DB_MODE().getUseServerMode();
                         }
                         break;
                     case CREATE_LOCAL:


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java
@@ -55,16 +55,6 @@ import fr.ird.observe.services.service.DatabaseNotFoundException;
 import fr.ird.observe.services.service.PingService;
 import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest;
 import fr.ird.observe.services.service.sql.SqlScriptProducerService;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nuiton.jaxx.runtime.JAXXContext;
-import org.nuiton.jaxx.runtime.swing.wizard.WizardModel;
-import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher;
-import org.nuiton.version.Version;
-
 import java.beans.PropertyChangeListener;
 import java.io.File;
 import java.io.FileInputStream;
@@ -77,6 +67,16 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.nuiton.jaxx.runtime.JAXXContext;
+import org.nuiton.jaxx.runtime.swing.wizard.WizardModel;
+import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher;
+import org.nuiton.version.Version;
+
 
 import static fr.ird.observe.application.swing.ui.admin.AdminUIModel.LOG_PROPERTY_CHANGE_LISTENER;
 import static org.nuiton.i18n.I18n.t;
@@ -161,7 +161,7 @@ public class StorageUIModel extends WizardModel<StorageStep> {
     /**
      * Un drapeau pour savoir si l'utilisateur a demandé une sauvegarde de la
      * base locale.
-     *
+     * <p>
      * Cette option n'est active uniquement si le drapeau localStorageExist est
      * à true.
      */
@@ -571,10 +571,10 @@ public class StorageUIModel extends WizardModel<StorageStep> {
                 mode = null;
             } else if (isCanCreateLocalService()) {
                 mode = CreationMode.IMPORT_EXTERNAL_DUMP;
-            } else if (isCanUseRemoteService()) {
-                mode = CreationMode.IMPORT_REMOTE_STORAGE;
             } else if (isCanUseServerService()) {
                 mode = CreationMode.IMPORT_SERVER_STORAGE;
+            } else if (isCanUseRemoteService()) {
+                mode = CreationMode.IMPORT_REMOTE_STORAGE;
             }
         }
 


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUI.jaxx
@@ -68,8 +68,8 @@ protected String updateCreationModeContent(DbMode mode) {
     <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'>
       <JPanel id='dbModeContent' constraints='BorderLayout.NORTH'>
         <JRadioButton id="useLocalMode" styleClass='dbMode'/>
-        <JRadioButton id="useRemoteMode" styleClass='dbMode'/>
         <JRadioButton id="useServerMode" styleClass='dbMode'/>
+        <JRadioButton id="useRemoteMode" styleClass='dbMode'/>
         <JRadioButton id="createLocalMode" styleClass='dbMode'/>
       </JPanel>
 
@@ -79,8 +79,8 @@ protected String updateCreationModeContent(DbMode mode) {
           <JRadioButton id="importInternalDumpMode" styleClass='creationMode'/>
           <JRadioButton id="importExternalDumpMode" styleClass='creationMode'/>
           <JRadioButton id="importLocalStorageMode" styleClass='creationMode'/>
-          <JRadioButton id="importRemoteStorageMode" styleClass='creationMode'/>
           <JRadioButton id="importServerStorageMode" styleClass='creationMode'/>
+          <JRadioButton id="importRemoteStorageMode" styleClass='creationMode'/>
         </JPanel>
         <JLabel id='noCreateMode' constraints='"noCreateMode"'/>
 


=====================================
application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx
=====================================
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx
@@ -71,45 +71,44 @@
         </row>
       </Table>
 
-      <!-- configurer creation base locale et import referentiel depuis base distante  -->
-      <Table id='IMPORT_REMOTE_STORAGE' fill="both" constraints='"IMPORT_REMOTE_STORAGE"'>
+      <!-- configurer creation base locale et import referentiel depuis un server distant  -->
+      <Table id='IMPORT_SERVER_STORAGE' fill="both" constraints='"IMPORT_SERVER_STORAGE"'>
         <row>
           <cell>
-            <JLabel text='observe.storage.importRemoteStorage.config'/>
+            <JLabel text='observe.storage.importServerStorage.config'/>
           </cell>
         </row>
         <row>
           <cell weighty='1' weightx='1'>
-            <JPanel id='IMPORT_REMOTE_STORAGE_content'/>
+            <JPanel id='IMPORT_SERVER_STORAGE_content'/>
           </cell>
         </row>
-
       </Table>
 
-      <!-- configurer creation base locale et import referentiel depuis un server distant  -->
-      <Table id='IMPORT_SERVER_STORAGE' fill="both" constraints='"IMPORT_SERVER_STORAGE"'>
+      <!-- configurer creation base locale et import referentiel depuis base distante  -->
+      <Table id='IMPORT_REMOTE_STORAGE' fill="both" constraints='"IMPORT_REMOTE_STORAGE"'>
         <row>
           <cell>
-            <JLabel text='observe.storage.importServerStorage.config'/>
+            <JLabel text='observe.storage.importRemoteStorage.config'/>
           </cell>
         </row>
         <row>
           <cell weighty='1' weightx='1'>
-            <JPanel id='IMPORT_SERVER_STORAGE_content'/>
+            <JPanel id='IMPORT_REMOTE_STORAGE_content'/>
           </cell>
         </row>
 
       </Table>
 
-      <!-- configurer connexion a base distante  -->
-      <Table id='USE_REMOTE' constraints='"USE_REMOTE"' fill='both'>
+      <!-- configurer connexion au server base distante  -->
+      <Table id='USE_SERVER' constraints='"USE_SERVER"' fill='both'>
         <row>
           <cell>
             <JPanel layout="{new BorderLayout()}">
-              <JLabel constraints='BorderLayout.WEST' text='observe.storage.useRemoteStorage.config'/>
-              <JMenuBar id='remoteMenuBar' constraints='BorderLayout.EAST'>
-                <JMenu id='remoteMenu'>
-                  <JMenuItem id="saveRemoteConfiguration"/>
+              <JLabel constraints='BorderLayout.WEST' text='observe.storage.useServerStorage.config'/>
+              <JMenuBar id='serverMenuBar' constraints='BorderLayout.EAST'>
+                <JMenu id='serverMenu'>
+                  <JMenuItem id="saveServerConfiguration"/>
                   <JSeparator/>
                 </JMenu>
               </JMenuBar>
@@ -118,20 +117,20 @@
         </row>
         <row>
           <cell weighty='1' weightx='1'>
-            <JPanel id='USE_REMOTE_content' minimumSize='{new Dimension(20,300)}'/>
+            <JPanel id='USE_SERVER_content' minimumSize='{new Dimension(20,300)}'/>
           </cell>
         </row>
       </Table>
 
-      <!-- configurer connexion au server base distante  -->
-      <Table id='USE_SERVER' constraints='"USE_SERVER"' fill='both'>
+      <!-- configurer connexion a base distante  -->
+      <Table id='USE_REMOTE' constraints='"USE_REMOTE"' fill='both'>
         <row>
           <cell>
             <JPanel layout="{new BorderLayout()}">
-              <JLabel constraints='BorderLayout.WEST' text='observe.storage.useServerStorage.config'/>
-              <JMenuBar id='serverMenuBar' constraints='BorderLayout.EAST'>
-                <JMenu id='serverMenu'>
-                  <JMenuItem id="saveServerConfiguration"/>
+              <JLabel constraints='BorderLayout.WEST' text='observe.storage.useRemoteStorage.config'/>
+              <JMenuBar id='remoteMenuBar' constraints='BorderLayout.EAST'>
+                <JMenu id='remoteMenu'>
+                  <JMenuItem id="saveRemoteConfiguration"/>
                   <JSeparator/>
                 </JMenu>
               </JMenuBar>
@@ -140,7 +139,7 @@
         </row>
         <row>
           <cell weighty='1' weightx='1'>
-            <JPanel id='USE_SERVER_content' minimumSize='{new Dimension(20,300)}'/>
+            <JPanel id='USE_REMOTE_content' minimumSize='{new Dimension(20,300)}'/>
           </cell>
         </row>
       </Table>


=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>9</version>
+    <version>10</version>
   </parent>
 
   <groupId>fr.ird.observe</groupId>
@@ -169,11 +169,11 @@
     <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
     <buildDate>${maven.build.timestamp}</buildDate>
 
-    <mavenVersion>3.3.9</mavenVersion>
+    <mavenVersion>3.5.0</mavenVersion>
 
-    <gitlabPluginVersion>1.0.7</gitlabPluginVersion>
     <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion>
     <processorPluginVersion>1.3</processorPluginVersion>
+    <!-- il faudra attendre la version 1.13 qui corrige des pb -->
     <licensePluginVersion>1.9</licensePluginVersion>
 
     <jaxxVersion>3.0-alpha-6</jaxxVersion>
@@ -184,12 +184,13 @@
     <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion>
     <nuitonConverterVersion>1.0</nuitonConverterVersion>
     <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion>
-    <xworkVersion>2.3.31</xworkVersion>
-    <hibernateVersion>5.1.3.Final</hibernateVersion>
-    <sl4jVersion>1.7.23</sl4jVersion>
+    <xworkVersion>2.3.32</xworkVersion>
+    <flexmarkVersion>0.18.9</flexmarkVersion>
+    <hibernateVersion>5.1.5.Final</hibernateVersion>
+    <sl4jVersion>1.7.25</sl4jVersion>
     <swingXVersion>1.6.5-1</swingXVersion>
-    <reflectionsVersion>0.9.10</reflectionsVersion>
-    <webmotionVersion>2.5.1</webmotionVersion>
+    <reflectionsVersion>0.9.11</reflectionsVersion>
+    <webmotionVersion>2.5.3</webmotionVersion>
     <httpComponentsVersion>4.5.3</httpComponentsVersion>
 
     <!-- license header configuration -->
@@ -571,7 +572,7 @@
       <dependency>
         <groupId>com.zaxxer</groupId>
         <artifactId>HikariCP</artifactId>
-        <version>2.6.0</version>
+        <version>2.6.1</version>
       </dependency>
 
       <dependency>
@@ -623,7 +624,7 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
-        <version>4.0.0-b02</version>
+        <version>4.0.0-b05</version>
         <scope>provided</scope>
       </dependency>
 
@@ -736,12 +737,12 @@
       <dependency>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark</artifactId>
-        <version>0.15.4</version>
+        <version>${flexmarkVersion}</version>
       </dependency>
       <dependency>
         <groupId>com.vladsch.flexmark</groupId>
         <artifactId>flexmark-util</artifactId>
-        <version>0.15.4</version>
+        <version>${flexmarkVersion}</version>
       </dependency>
 
       <dependency>



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

---
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bb6727d9c3148ca839961af94f9...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)