From 41ec1a1df007fd847e2256be28111c202d52a3ff Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Sun, 1 Nov 2020 17:12:44 +0300
Subject: [PATCH] Config fixes

---
 .../plugin.xml                                | 20 +++++++++----------
 .../service/core/impl/WebServiceCore.java     |  1 +
 server/drivers/pom.xml                        |  8 ++++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml b/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml
index 894ab4d03d..47319e1496 100644
--- a/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml
+++ b/server/bundles/io.cloudbeaver.resources.drivers.base/plugin.xml
@@ -2,37 +2,37 @@
 <plugin>
     <!-- Resource mappings -->
     <extension point="org.jkiss.dbeaver.resources">
+        <resource name="drivers/mysql/mysql8"/>
+        <resource name="drivers/mariadb"/>
+        <resource name="drivers/postgresql"/>
         <resource name="drivers/clickhouse"/>
         <resource name="drivers/derby"/>
         <resource name="drivers/jaybird"/>
         <resource name="drivers/h2"/>
-        <resource name="drivers/mysql/mysql8"/>
-        <resource name="drivers/mariadb"/>
-        <resource name="drivers/postgresql"/>
         <resource name="drivers/sqlite/xerial"/>
     </extension>
 
     <!-- Bundles  -->
     <extension point="org.jkiss.dbeaver.product.bundles">
+        <bundle id="drivers.mysql" label="MySQL drivers"/>
+        <bundle id="drivers.mariadb" label="MariaDB drivers"/>
+        <bundle id="drivers.postgresql" label="PostgreSQL drivers"/>
         <bundle id="drivers.clickhouse" label="Clickhouse drivers"/>
         <bundle id="drivers.derby" label="Derby drivers"/>
         <bundle id="drivers.firebird" label="Firebird drivers"/>
         <bundle id="drivers.h2" label="H2 drivers"/>
-        <bundle id="drivers.mysql" label="MySQL drivers"/>
-        <bundle id="drivers.mariadb" label="MariaDB drivers"/>
-        <bundle id="drivers.postgresql" label="PostgreSQL drivers"/>
         <bundle id="drivers.sqlite.xerial" label="SQLite drivers"/>
     </extension>
 
     <!-- Enabled drivers -->
     <extension point="io.cloudbeaver.driver">
-        <driver id="generic:yandex_clickhouse"/>
-        <driver id="generic:derby_server"/>
-        <driver id="jaybird:jaybird"/>
-        <driver id="generic:h2_embedded"/>
         <driver id="mysql:mysql8"/>
         <driver id="mysql:mariaDB"/>
         <driver id="postgresql:postgres-jdbc"/>
+        <driver id="jaybird:jaybird"/>
+        <driver id="generic:yandex_clickhouse"/>
+        <driver id="generic:derby_server"/>
+        <driver id="generic:h2_embedded"/>
         <driver id="generic:sqlite_jdbc"/>
     </extension>
 
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
index 8b8326bc42..430fa93f50 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/core/impl/WebServiceCore.java
@@ -246,6 +246,7 @@ public class WebServiceCore implements DBWServiceCore {
                     dataSourceContainer.getConnectionConfiguration().setAuthProperty(s, CommonUtils.toString(o)));
             }
             dataSourceContainer.setSavePassword(true);
+            dataSourceContainer.persistConfiguration();
         }
 
         return connectionInfo;
diff --git a/server/drivers/pom.xml b/server/drivers/pom.xml
index 1e1ed248b6..fda37f1b2b 100644
--- a/server/drivers/pom.xml
+++ b/server/drivers/pom.xml
@@ -11,13 +11,13 @@
     </properties>
 
     <modules>
-        <module>clickhouse</module>
-        <module>derby</module>
-        <module>h2</module>
-        <module>jaybird</module>
         <module>mysql</module>
         <module>mariadb</module>
         <module>postgresql</module>
+        <module>jaybird</module>
+        <module>clickhouse</module>
+        <module>derby</module>
+        <module>h2</module>
         <module>sqlite</module>
     </modules>