Cloud extension improvements

Show user display name (if present)
Non-standard connections support
2026-10-16 14:50:15 +08:00 · 2020-05-21 16:47:30 +03:00 · 2020-05-21 10:23:17 +03:00 · 2020-05-21 01:44:46 +03:00 · 2020-05-20 23:16:39 +03:00 · 2020-05-20 22:53:22 +03:00
279 changed files with 5640 additions and 5800 deletions
@@ -39,4 +39,4 @@ dist/
 .settings/

 deploy/cloudbeaver
-server/**/target
+server/**/target
@@ -24,9 +24,19 @@ You can see live demo of CloudBeaver here: https://demo.cloudbeaver.io

 ## Changelog

+### CloudBeaver 1.0.2 - 2020-05-19
+
+- Data export feature UI was improved
+- User authentication and permission management
+- Driver management was redesigned
+- Clickhouse driver was added
+- Build procedure was redesigned
+- Many minor bugfixes
+
 ### CloudBeaver 1.0.1 - 2020-05-05

 - Data export feature added to the data viewer
+- H2 embedded database driver was added
 - User authentication API was added
 - Product configuration framework and API was added
 - Embedded database for user management was added
@@ -1,2 +1,3 @@
 build
 cloudbeaver
+drivers
@@ -1,6 +1,7 @@
@echo off
 echo Clone and build Cloudbeaver

+IF EXIST drivers rmdir /S /Q drivers
 IF EXIST cloudbeaver rmdir /S /Q cloudbeaver
 mkdir cloudbeaver
 mkdir cloudbeaver\server
@@ -30,14 +31,14 @@ copy scripts\* cloudbeaver >NUL
 mkdir cloudbeaver\workspace\GlobalConfiguration
 xcopy /E /Q ..\samples\sample-databases\GlobalConfiguration cloudbeaver\workspace\GlobalConfiguration >NUL
 copy ..\samples\sample-databases\*.conf cloudbeaver\conf >NUL
+move drivers cloudbeaver >NUL

 echo Build static content

 cd ..\webapp

-rem call npm i lerna -g
-call lerna bootstrap
-call lerna run build --scope @dbeaver/dbeaver -- --pluginsList=../../../../products/default/plugins-list.js
+call yarn run bootstrap
+call yarn run build

 cd ..\deploy

@@ -46,3 +47,5 @@ echo Copy static content
 xcopy /E /Q ..\webapp\packages\dbeaver\dist cloudbeaver\web >NUL

 echo Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server.
+
+pause
@@ -1,6 +1,7 @@
 #!/bin/bash
 echo "Clone and build Cloudbeaver"

+rm -rf ./drivers
 rm -rf ./cloudbeaver
 mkdir ./cloudbeaver
 mkdir ./cloudbeaver/server
@@ -11,10 +12,8 @@ mkdir ./cloudbeaver/web
 echo "Pull dbeaver platform"

 cd ../..
-if [[ ! -f dbeaver ]]
-then
-  git clone --depth 1 https://github.com/dbeaver/dbeaver.git
-fi
+[ ! -d dbeaver ] && git clone --depth 1 https://github.com/dbeaver/dbeaver.git
+
 cd dbeaver
 git pull
 cd ../cloudbeaver/deploy
@@ -29,16 +28,16 @@ echo "Copy server packages"

 cp -rp ../server/product/web-server/target/products/io.cloudbeaver.product/all/all/all/* ./cloudbeaver/server
 cp -p ./scripts/* ./cloudbeaver
-mkdir ./cloudbeaver/workspace/GlobalConfiguration
 cp -rp ../samples/sample-databases/GlobalConfiguration cloudbeaver/workspace
-cp ../samples/sample-databases/*.conf cloudbeaver/conf/
+cp -p ../samples/sample-databases/*.conf cloudbeaver/conf/
+mv drivers cloudbeaver

 echo "Build static content"

 cd ../webapp

-lerna bootstrap
-lerna run build --scope @dbeaver/dbeaver -- --pluginsList=../../../../products/default/plugins-list.js
+yarn run bootstrap
+yarn run build

 cd ../deploy

@@ -1,7 +1,6 @@
@rem echo off
-
 for /f %%a in ('dir /B /S server\plugins\org.eclipse.equinox.launcher*.jar') do SET launcherJar="%%a"

 echo "Starting Cloudbeaver Server"

-java -jar %launcherJar% -product io.cloudbeaver.server.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs -Xmx2048M
+java -jar %launcherJar% -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs -Xmx2048M
@@ -2,4 +2,5 @@
 launcherJar=( server/plugins/org.eclipse.equinox.launcher*.jar )

 echo "Starting Cloudbeaver Server"
-java -jar ${launcherJar} -product io.cloudbeaver.server.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs -Xmx2048M
+
+java -jar ${launcherJar} -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage -vmargs -Xmx2048M
@@ -39,6 +39,7 @@
    },
    app: {
        anonymousAccessEnabled: true,
+        authenticationEnabled: false,
        anonymousUserRole: "user",
        supportsCustomConnections: false

@@ -66,9 +66,9 @@ public class SampleDataSourceConfigurationStorage implements DBPDataSourceConfig
            if (sampleConfigFile.exists()) {
                log.debug("Loading provided connections from [" + sampleConfigFile.getFullPath().toString() + "]");
                List<? extends DBPDataSourceContainer> dsList = registry.loadDataSourcesFromFile(this, sampleConfigFile);
-                for (DBPDataSourceContainer ds : dsList) {
-                    log.debug("\tProvided connection: " + ds.getName());
-                }
+//                for (DBPDataSourceContainer ds : dsList) {
+//                    log.debug("\tProvided connection: " + ds.getName());
+//                }
                return dsList;
            }
        }
@@ -77,7 +77,7 @@ public class SampleDataSourceConfigurationStorage implements DBPDataSourceConfig

    @Override
    public String getConfigurationFileSuffix() {
-        return "sample";
+        return "-sample";
    }

 }
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Vendor: %Bundle-Vendor
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: io.cloudbeaver.product.ce;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Release-Date: 20200518
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-ActivationPolicy: lazy
+Bundle-ClassPath: .
+Require-Bundle: io.cloudbeaver.server
+Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: io.cloudbeaver.product.ce
@@ -0,0 +1,2 @@
+Bundle-Vendor = DBeaver Corp
+Bundle-Name = Cloudbeaver CE bundle
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+ META-INF/,\
+ OSGI-INF/,\
+ plugin.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+
+<plugin>
+
+    <extension point="org.eclipse.core.runtime.applications" id="application" name="CloudBeaver Web Application">
+        <application visible="true">
+            <run class="io.cloudbeaver.server.CBApplication"/>
+        </application>
+    </extension>
+
+    <extension point="org.eclipse.core.runtime.products" id="product">
+        <product application="io.cloudbeaver.product.ce.application" description="Cloudbeaver Web UI Application" name="CloudBeaver CE Server">
+            <property name="appName" value="CloudBeaver CE Server"/>
+        </product>
+    </extension>
+
+    <extension point="org.jkiss.dbeaver.application">
+        <application id="cloudbeaver-server" name="CloudBeaver CE Server" description="CloudBeaver Web UI"/>
+    </extension>
+
+</plugin>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+         <relativePath>../</relativePath>
+    </parent>
+    <artifactId>io.cloudbeaver.product.ce</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>eclipse-plugin</packaging>
+
+</project>
@@ -0,0 +1,25 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2020 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.server;
+
+/**
+ * Auth provider
+ */
+public class CBServerCE {
+
+
+}
@@ -6,6 +6,5 @@ Bundle-Version: 1.0.2.qualifier
 Bundle-Release-Date: 20200518
 Bundle-Vendor: DBeaver Corp
 Bundle-ActivationPolicy: lazy
-Eclipse-BundleShape: dir
 Automatic-Module-Name: io.cloudbeaver.resources.drivers.base
 Require-Bundle: io.cloudbeaver.server
@@ -1,3 +1,2 @@
-source.. = 
-bin.includes = plugin.xml,META-INF/,drivers/
+bin.includes = plugin.xml,META-INF/
 src.includes = 
@@ -1,138 +0,0 @@
-H2 License - Version 1.0
-1. Definitions
-
-1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code available to a third party.
-
-1.1. "Contributor" means each entity that creates or contributes to the creation of Modifications.
-
-1.2. "Contributor Version" means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
-
-1.3. "Covered Code" means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof.
-
-1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted in the software development community for the electronic transfer of data.
-
-1.5. "Executable" means Covered Code in any form other than Source Code.
-
-1.6. "Initial Developer" means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
-
-1.7. "Larger Work" means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
-
-1.8. "License" means this document.
-
-1.8.1. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-
-1.9. "Modifications" means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
-
-1.9.a. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
-
-1.9.b. Any new file that contains any part of the Original Code or previous Modifications.
-
-1.10. "Original Code" means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
-
-1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-
-1.11. "Source Code" means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
-
-1.12. "You" (or "Your") means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-2. Source Code License
-2.1. The Initial Developer Grant
-
-The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-2.1.a. under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and
-
-2.1.b. under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof).
-
-2.1.c. the licenses granted in this Section 2.1 (a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License.
-
-2.1.d. Notwithstanding Section 2.1 (b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code; or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices.
-2.2. Contributor Grant
-
-Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license
-
-2.2.a. under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and
-
-2.2.b. under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
-
-2.2.c. the licenses granted in Sections 2.2 (a) and 2.2 (b) are effective on the date Contributor first makes Commercial Use of the Covered Code.
-
-2.2.c. Notwithstanding Section 2.2 (b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2) separate from the Contributor Version; 3) for infringements caused by: i) third party modifications of Contributor Version or ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.
-3. Distribution Obligations
-3.1. Application of License
-
-The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
-3.2. Availability of Source Code
-
-Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.
-3.3. Description of Modifications
-
-You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
-3.4. Intellectual Property Matters
-
-3.4.a. Third Party Claims: If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL" which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
-
-3.4.b. Contributor APIs: If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the legal file.
-
-3.4.c. Representations: Contributor represents that, except as disclosed pursuant to Section 3.4 (a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License.
-3.5. Required Notices
-
-You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-3.6. Distribution of Executable Versions
-
-You may distribute Covered Code in Executable form only if the requirements of Sections 3.1, 3.2, 3.3, 3.4 and 3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-3.7. Larger Works
-
-You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
-4. Inability to Comply Due to Statute or Regulation.
-
-If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the legal file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
-5. Application of this License.
-
-This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code.
-6. Versions of the License.
-6.1. New Versions
-
-The H2 Group may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
-6.2. Effect of New Versions
-
-Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by the H2 Group. No one other than the H2 Group has the right to modify the terms applicable to Covered Code created under this License.
-6.3. Derivative Works
-
-If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases "H2 Group", "H2" or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the H2 License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.)
-7. Disclaimer of Warranty
-
-Covered code is provided under this license on an "as is" basis, without warranty of any kind, either expressed or implied, including, without limitation, warranties that the covered code is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire risk as to the quality and performance of the covered code is with you. Should any covered code prove defective in any respect, you (not the initial developer or any other contributor) assume the cost of any necessary servicing, repair or correction. This disclaimer of warranty constitutes an essential part of this license. No use of any covered code is authorized hereunder except under this disclaimer.
-8. Termination
-
-8.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-
-8.2. If You initiate litigation by asserting a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant") alleging that:
-
-8.2.a. such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i) agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant. If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above.
-
-8.2.b. any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant.
-
-8.3. If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license.
-
-8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.
-9. Limitation of Liability
-
-Under no circumstances and under no legal theory, whether tort (including negligence), contract, or otherwise, shall you, the initial developer, any other contributor, or any distributor of covered code, or any supplier of any of such parties, be liable to any person for any indirect, special, incidental, or consequential damages of any character including, without limitation, damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if such party shall have been informed of the possibility of such damages. This limitation of liability shall not apply to liability for death or personal injury resulting from such party's negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to you.
-10. United States Government End Users
-
-The Covered Code is a "commercial item", as that term is defined in 48 C.F.R. 2.101 (October 1995), consisting of "commercial computer software" and "commercial computer software documentation", as such terms are used in 48 C.F.R. 12.212 (September 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein.
-11. Miscellaneous
-
-This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License.
-12. Responsibility for Claims
-
-As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-13. Multiple-Licensed Code
-
-Initial Developer may designate portions of the Covered Code as "Multiple-Licensed". "Multiple-Licensed" means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of this or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A.
-Exhibit A
-
-Multiple-Licensed under the H2 License, Version 1.0,
-and under the Eclipse Public License, Version 1.0
-(http://h2database.com/html/license.html).
-Initial Developer: H2 Group
@@ -1,5 +0,0 @@
-Jaybird JCA/JDBC driver is distributed under the GNU Lesser General Public License (LGPL). Text of the license can be obtained from http://www.gnu.org/copyleft/lesser.html.
-
-Using Jaybird (by importing Jaybird's public interfaces in your Java code), and extending Jaybird by subclassing or implementation of an extension interface (but not abstract or concrete class) is considered by the authors of Jaybird to be dynamic linking. Hence our interpretation of the LGPL is that the use of the unmodified Jaybird source does not affect the license of your application code.
-
-Even more, all extension interfaces to which application might want to link are released under dual LGPL/modified BSD license. Latter is basically “AS IS” license that allows any kind of use of that source code. Jaybird should be viewed as an implementation of that interfaces and LGPL section for dynamic linking is applicable in this case.
@@ -1 +0,0 @@
-MariaDB JDBC driver is distributed under the GNU Lesser General Public License (LGPL). Text of the license can be obtained from http://www.gnu.org/copyleft/lesser.html.
@@ -1,307 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software
-    interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as 
-a special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time.  Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and 
-"any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation.  If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author to ask for permission.  For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this.  Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it
-    does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License as
-    published by     the Free Software Foundation; either version 
-    2 of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
-    type 'show w'. This is free software, and you are welcome 
-    to redistribute it under certain conditions; type 'show c' 
-    for details.
-
-The hypothetical commands 'show w' and 'show c' should show the appropriate parts of the General Public License.  Of course, the commands you use may be called something other than 'show w' and
-'show c'; they could even be mouse-clicks or menu items--whatever 
-suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  program 'Gnomovision' (which makes passes at compilers) written 
-  by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into proprietary programs.  If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library.  If this is what you want to do, use 
-the GNU Lesser General Public License instead of this License.
@@ -1,26 +0,0 @@
-Copyright (c) 1997-2010, PostgreSQL Global Development Group
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-3. Neither the name of the PostgreSQL Global Development Group nor the names
-   of its contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
@@ -1,62 +0,0 @@
-SQLite JDBC driver developed by Taro L. Saito is an extension of Zentus's SQLite JDBC driver that enables Java to access SQLite database files.
-This program follows the Apache License version 2.0 (http://www.apache.org/licenses/ )
-
-
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
- */
-
@@ -1,71 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <plugin>
-    <!-- PostgreSQL -->
+    <!-- Resource mappings -->
    <extension point="org.jkiss.dbeaver.resources">
-        <resource name="drivers/postgresql/LICENSE.txt"/>
-        <resource name="drivers/postgresql/postgresql-42.2.5.jar" alias="drivers/postgresql/postgresql.jar"/>
-        <resource name="drivers/postgis/postgis-jdbc-2.2.1.jar" alias="drivers/postgis/postgis-jdbc.jar"/>
-        <resource name="drivers/waffle/waffle-jna-1.9.0.jar" alias="drivers/waffle/waffle-jna.jar"/>
-        <resource name="drivers/waffle/caffeine-2.6.2.jar" alias="drivers/waffle/caffeine.jar"/>
+        <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>

-    <!-- MySQL -->
-    <extension point="org.jkiss.dbeaver.resources">
-        <resource name="drivers/mysql/LICENSE.txt"/>
-        <resource name="drivers/mysql/mysql-connector-java-5.1.44.jar" alias="drivers/mysql/mysql-connector-java.jar"/>
-        <resource name="drivers/mysql/mysql-connector-java-8.0.11.jar" alias="drivers/mysql/mysql-connector-java-8.jar"/>
-        <resource name="drivers/mysql/protobuf-java-2.6.0.jar" alias="drivers/mysql/protobuf-java.jar"/>
-    </extension>
-
-    <!-- MariaDB -->
-    <extension point="org.jkiss.dbeaver.resources">
-        <resource name="drivers/mariadb/LICENSE.txt"/>
-        <resource name="drivers/mariadb/mariadb-java-client-2.6.0.jar" alias="drivers/mariadb/mariadb-java-client.jar"/>
-    </extension>
-
-    <!-- Firebird -->
-
-    <extension point="org.jkiss.dbeaver.resources">
-        <resource name="drivers/jaybird/LICENSE.txt"/>
-        <resource name="drivers/jaybird/antlr4-runtime-4.7.2.jar" alias="drivers/jaybird/antlr4-runtime.jar"/>
-        <resource name="drivers/jaybird/connector-api-1.5.jar" alias="drivers/jaybird/connector-api.jar"/>
-        <resource name="drivers/jaybird/jaybird-4.0.0.java8.jar" alias="drivers/jaybird/jaybird.jar"/>
-    </extension>
-
-    <!-- SQLite -->
-
-    <extension point="org.jkiss.dbeaver.resources">
-        <resource name="drivers/sqlite/xerial/LICENSE.txt"/>
-        <resource name="drivers/sqlite/xerial/sqlite-jdbc-3.30.1.jar" alias="drivers/sqlite/xerial/sqlite-jdbc.jar"/>
-    </extension>
-
-    <!-- H2 -->
-
-    <extension point="org.jkiss.dbeaver.resources">
-        <resource name="drivers/h2/LICENSE.txt"/>
-        <resource name="drivers/h2/h2-1.4.196.jar" alias="drivers/h2/h2.jar"/>
-    </extension>
-
-    <!-- Drivers config -->
-
+    <!-- Bundles  -->
    <extension point="org.jkiss.dbeaver.product.bundles">
-        <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.firebird" label="Firebird drivers"/>
+        <bundle id="drivers.postgresql" label="PostgreSQL drivers"/>
        <bundle id="drivers.sqlite.xerial" label="SQLite drivers"/>
-        <bundle id="drivers.h2" label="H2 drivers"/>
    </extension>

    <!-- Enabled drivers -->
    <extension point="io.cloudbeaver.driver">
-        <driver id="postgresql:postgres-jdbc"/>
+        <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="generic:sqlite_jdbc"/>
-        <driver id="generic:derby_server"/>
-        <driver id="generic:h2_embedded"/>
-        <driver id="jaybird:jaybird"/>
    </extension>


@@ -6,22 +6,6 @@
    <extension-point id="io.cloudbeaver.service" name="Web services" schema="schema/io.cloudbeaver.service.exsd"/>
    <extension-point id="io.cloudbeaver.driver" name="Web drivers" schema="schema/io.cloudbeaver.driver.exsd"/>

-    <extension point="org.eclipse.core.runtime.applications" id="standalone" name="Cloudbeaver Web Application">
-        <application visible="true">
-            <run class="io.cloudbeaver.server.CBApplication"/>
-        </application>
-    </extension>
-
-    <extension point="org.eclipse.core.runtime.products" id="product">
-        <product application="io.cloudbeaver.server.standalone" description="Cloudbeaver Web UI Application" name="Cloudbeaver Web Server">
-            <property name="appName" value="Cloudbeaver Web Server"/>
-        </product>
-    </extension>
-
-    <extension point="org.jkiss.dbeaver.application">
-        <application id="cloudbeaver-server" name="Cloudbeaver Web Server" description="Cloudbeaver Web UI"/>
-    </extension>
-
    <extension point="org.eclipse.core.runtime.adapters">
        <factory adaptableType="org.jkiss.dbeaver.runtime.DBWorkbench" class="io.cloudbeaver.server.WebPlatformAdapterFactory">
            <adapter type="org.jkiss.dbeaver.model.app.DBPPlatform"/>
@@ -60,7 +60,7 @@ type ServerConfig {
    supportsConnectionBrowser: Boolean
    supportsWorkspaces: Boolean

-    supportedLanguages: [ ServerLanguage ]!
+    supportedLanguages: [ ServerLanguage! ]!
    services: [ WebServiceConfig ]
    productConfiguration: Object!
 }
@@ -73,7 +73,7 @@ type SessionInfo {
    cacheExpired: Boolean!

    serverMessages: [ ServerMessage ]
-    connections: [ ConnectionInfo ]!
+    connections: [ ConnectionInfo! ]!
 }

 ####################################################
@@ -183,7 +183,7 @@ type ConnectionInfo {
    clientVersion: String

    # Supported features (provided etc)
-    features: [ String! ]
+    features: [ String! ]!
 }

 type LogEntry {
@@ -199,30 +199,30 @@ type LogEntry {

 extend type Query {
    # Returns server config
-    serverConfig: ServerConfig
+    serverConfig: ServerConfig!

    # Returns session state ( initialize if not )
-    sessionState: SessionInfo
+    sessionState: SessionInfo!

    # Session permissions
    sessionPermissions: [ID]!

    # Get driver info
-    driverList( id: ID ): [ DriverInfo! ]
+    driverList( id: ID ): [ DriverInfo! ]!

    # Get list of predefined data sources
-    dataSourceList: [ DataSourceInfo! ]
+    dataSourceList: [ DataSourceInfo! ]!

    # Return connection state
-    connectionState( id: ID! ): ConnectionInfo
+    connectionState( id: ID! ): ConnectionInfo!

-    readSessionLog(maxEntries: Int, clearEntries: Boolean): [ LogEntry! ]
+    readSessionLog(maxEntries: Int, clearEntries: Boolean): [ LogEntry! ]!

 }

 extend type Mutation {
    # Initialize session
-    openSession: SessionInfo
+    openSession: SessionInfo!

    # Destroy session
    closeSession: Boolean
@@ -234,13 +234,13 @@ extend type Mutation {
    changeSessionLanguage(locale: String): Boolean

    # Create new connection
-    createConnection( config: ConnectionConfig! ): ConnectionInfo
+    createConnection( config: ConnectionConfig! ): ConnectionInfo!

    # Test connection configuration. Returns remote server version
-    testConnection( config: ConnectionConfig! ): ConnectionInfo
+    testConnection( config: ConnectionConfig! ): ConnectionInfo!

    # Connect to database
-    openConnection( config: ConnectionConfig! ): ConnectionInfo
+    openConnection( config: ConnectionConfig! ): ConnectionInfo!

    # Disconnect from database
    closeConnection( id: ID! ): Boolean!
@@ -29,7 +29,7 @@ type ObjectPropertyInfo {
    # Default property value
    defaultValue: Object
    # Supported features (system, hidden, inherited, foreign, expensive, etc)
-    features: [ String! ]
+    features: [ String! ]!
 }

 input ObjectPropertyFilter {
@@ -94,10 +94,8 @@ type NavigatorNodeInfo {
 }

 type DatabaseStructContainers {
-
    catalogList: [ DatabaseObjectInfo! ]!
    schemaList: [ DatabaseObjectInfo! ]!
-
 }

 ####################################################
@@ -111,9 +109,9 @@ extend type Query {
        parentPath: ID!,
        offset: Int,
        limit: Int,
-        onlyFolders: Boolean): [ NavigatorNodeInfo! ]
+        onlyFolders: Boolean): [ NavigatorNodeInfo! ]!

-    navNodeInfo( nodePath: ID! ): NavigatorNodeInfo
+    navNodeInfo( nodePath: ID! ): NavigatorNodeInfo!

    navRefreshNode( nodePath: ID! ): Boolean

@@ -99,7 +99,7 @@ type SQLExecuteInfo {

    statusMessage: String
    duration: Int
-    results: [ SQLQueryResults! ]
+    results: [ SQLQueryResults! ]!
 }

 extend type Query {
@@ -62,7 +62,7 @@ public class LocalAuthProvider implements DBWAuthProvider<LocalAuthToken> {
    }

    public static String makeClientPasswordHash(String userName, String password) {
-        return SecurityUtils.makeDigest(userName, password);
+        return SecurityUtils.makeDigest(password);
    }

 }
@@ -152,6 +152,9 @@ public class WebDatabaseDriverConfig {
            cfg.setHostPort(driver.getDefaultPort());
            cfg.setUrl(driver.getDataSourceProvider().getConnectionURL(driver, cfg));
            DBPPropertyDescriptor[] properties = driver.getDataSourceProvider().getConnectionProperties(webSession.getProgressMonitor(), driver, cfg);
+            if (properties == null) {
+                return new WebPropertyInfo[0];
+            }

            PropertySourceCustom propertySource = new PropertySourceCustom(
                properties,
@@ -30,16 +30,15 @@ import org.eclipse.core.runtime.Status;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
-import org.jkiss.dbeaver.model.app.DBPPlatform;
 import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.exec.DBCException;
 import org.jkiss.dbeaver.model.meta.Association;
 import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.navigator.DBNModel;
+import org.jkiss.dbeaver.model.navigator.DBNNode;
 import org.jkiss.dbeaver.model.navigator.DBNProject;
 import org.jkiss.dbeaver.model.navigator.DBNProjectDatabases;
 import org.jkiss.dbeaver.model.runtime.*;
-import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.dbeaver.runtime.jobs.DisconnectJob;
 import org.jkiss.utils.CommonUtils;

@@ -74,7 +73,7 @@ public class WebSession {
    private String locale;
    private boolean cacheExpired;

-    private final List<WebConnectionInfo> connections = new ArrayList<>();
+    private final Map<String, WebConnectionInfo> connections = new HashMap<>();
    private final List<WebServerMessage> progressMessages = new ArrayList<>();

    private final Map<String, WebAsyncTaskInfo> asyncTasks = new HashMap<>();
@@ -84,6 +83,7 @@ public class WebSession {
    private DBNModel navigatorModel;
    private DBNProjectDatabases databases;
    private DBRProgressMonitor progressMonitor = new SessionProgressMonitor();
+    private DBNProject projectNode;

    public WebSession(HttpSession httpSession) {
        this.id = httpSession.getId();
@@ -91,15 +91,6 @@ public class WebSession {
        this.lastAccessTime = this.createTime;
        this.locale = CommonUtils.toString(httpSession.getAttribute(ATTR_LOCALE), this.locale);

-        DBPPlatform platform = DBWorkbench.getPlatform();
-        this.navigatorModel = new DBNModel(platform, false);
-        this.navigatorModel.initialize();
-
-        DBPProject project = platform.getWorkspace().getActiveProject();
-        DBNProject projectNode = this.navigatorModel.getRoot().getProjectNode(project);
-        this.databases = projectNode.getDatabases();
-        this.locale = Locale.getDefault().getLanguage();
-
        if (!httpSession.isNew()) {
            try {
                // Check persistent state
@@ -109,15 +100,7 @@ public class WebSession {
            }
        }

-        // Add all provided datasources to the session
-        synchronized (connections) {
-            for (DBPDataSourceContainer ds : databases.getDataSourceRegistry().getDataSources()) {
-                if (ds.isProvided()) {
-                    WebConnectionInfo connectionInfo = new WebConnectionInfo(this, ds);
-                    connections.add(connectionInfo);
-                }
-            }
-        }
+        initNavigatorModel();
    }

    @Property
@@ -174,6 +157,12 @@ public class WebSession {
        }
        this.user = user;

+        try {
+            resetSessionCache();
+            initNavigatorModel();
+        } catch (DBCException e) {
+            log.error(e);
+        }
        try {
            refreshSessionAuth();
        } catch (DBCException e) {
@@ -181,10 +170,66 @@ public class WebSession {
        }
    }

+    private void initNavigatorModel() {
+        CBPlatform platform = CBPlatform.getInstance();
+        this.navigatorModel = new DBNModel(platform, this);
+        this.navigatorModel.initialize();
+
+        DBPProject project = platform.getWorkspace().getActiveProject();
+        this.projectNode = this.navigatorModel.getRoot().getProjectNode(project);
+        this.databases = projectNode.getDatabases();
+        this.locale = Locale.getDefault().getLanguage();
+
+        // Add all provided datasources to the session
+        synchronized (connections) {
+            for (DBPDataSourceContainer ds : databases.getDataSourceRegistry().getDataSources()) {
+                if (ds.isProvided()) {
+                    WebConnectionInfo connectionInfo = new WebConnectionInfo(this, ds);
+                    connections.put(connectionInfo.getId(), connectionInfo);
+                }
+            }
+        }
+    }
+
+    private void resetSessionCache() throws DBCException {
+        // Clear attributes
+        synchronized (attributes) {
+            for (Map.Entry<String, Function<Object,Object>> attrDisposer : attributeDisposers.entrySet()) {
+                Object attrValue = attributes.get(attrDisposer.getKey());
+                attrDisposer.getValue().apply(attrValue);
+            }
+            attributeDisposers.clear();
+            attributes.clear();
+        }
+
+        Map<String, WebConnectionInfo> conCopy;
+        synchronized (this.connections) {
+            conCopy = new HashMap<>(this.connections);
+            this.connections.clear();
+        }
+
+        for (WebConnectionInfo connectionInfo : conCopy.values()) {
+            if (connectionInfo.isConnected()) {
+                new DisconnectJob(connectionInfo.getDataSourceContainer()).schedule();
+            }
+        }
+
+        if (this.navigatorModel != null) {
+            this.navigatorModel.dispose();
+            this.navigatorModel = null;
+        }
+        this.databases = null;
+    }
+
    private void refreshSessionAuth() throws DBCException {
        CBApplication application = CBPlatform.getInstance().getApplication();
        if (this.user == null) {
-            sessionPermissions = application.getSecurityController().getSubjectPermissions(application.getAppConfiguration().getAnonymousUserRole());
+            if (application.getAppConfiguration().isAnonymousAccessEnabled()) {
+                sessionPermissions = application.getSecurityController().getSubjectPermissions(
+                    application.getAppConfiguration().getAnonymousUserRole());
+            } else {
+                sessionPermissions = Collections.emptySet();
+            }
        } else {
            sessionPermissions = application.getSecurityController().getUserPermissions(this.user.getUserId());
        }
@@ -203,7 +248,15 @@ public class WebSession {
        return navigatorModel;
    }

-    public DBNProjectDatabases getDatabases() {
+    public DBNProject getProjectNode() {
+        return projectNode;
+    }
+
+    public DBNProjectDatabases getDatabasesNode() {
+        return databases;
+    }
+
+    public DBNNode getNavigatorNodes() {
        return databases;
    }

@@ -245,23 +298,26 @@ public class WebSession {
    @Association
    public List<WebConnectionInfo> getConnections() {
        synchronized (connections) {
-            return new ArrayList<>(connections);
+            return new ArrayList<>(connections.values());
        }
    }

    @NotNull
    public WebConnectionInfo getWebConnectionInfo(String connectionID) throws DBWebException {
-        WebConnectionInfo connectionInfo = null;
+        WebConnectionInfo connectionInfo;
        synchronized (connections) {
-            for (WebConnectionInfo ci : connections) {
-                if (ci.getId().equals(connectionID)) {
-                    connectionInfo = ci;
-                    break;
-                }
-            }
+            connectionInfo = connections.get(connectionID);
        }
        if (connectionInfo == null) {
-            throw new DBWebException("Connection '" + connectionID + "' not found");
+            DBPDataSourceContainer dataSource = databases.getDataSourceRegistry().getDataSource(connectionID);
+            if (dataSource != null) {
+                connectionInfo = new WebConnectionInfo(this, dataSource);
+                synchronized (connections) {
+                    connections.put(connectionID, connectionInfo);
+                }
+            } else {
+                throw new DBWebException("Connection '" + connectionID + "' not found");
+            }
        }
        return connectionInfo;
    }
@@ -269,45 +325,19 @@ public class WebSession {

    public void addConnection(WebConnectionInfo connectionInfo) {
        synchronized (connections) {
-            connections.add(connectionInfo);
+            connections.put(connectionInfo.getId(), connectionInfo);
        }
    }

    public void removeConnection(WebConnectionInfo connectionInfo) {
        synchronized (connections) {
-            connections.remove(connectionInfo);
+            connections.remove(connectionInfo.getId());
        }
    }

    void close() {
        try {
-            // Clear attributes
-            synchronized (attributes) {
-                for (Map.Entry<String, Function<Object,Object>> attrDisposer : attributeDisposers.entrySet()) {
-                    Object attrValue = attributes.get(attrDisposer.getKey());
-                    attrDisposer.getValue().apply(attrValue);
-                }
-                attributeDisposers.clear();
-                attributes.clear();
-            }
-
-            List<WebConnectionInfo> conCopy;
-            synchronized (this.connections) {
-                conCopy = new ArrayList<>(this.connections);
-                this.connections.clear();
-            }
-
-            for (WebConnectionInfo connectionInfo : conCopy) {
-                if (connectionInfo.isConnected()) {
-                    new DisconnectJob(connectionInfo.getDataSourceContainer()).schedule();
-                }
-            }
-
-            if (this.navigatorModel != null) {
-                this.navigatorModel.dispose();
-                this.navigatorModel = null;
-            }
-            this.databases = null;
+            resetSessionCache();
        } catch (Throwable e) {
            log.error(e);
        }
@@ -17,10 +17,14 @@
 package io.cloudbeaver.model.user;

 import io.cloudbeaver.registry.WebAuthProviderDescriptor;
+import io.cloudbeaver.registry.WebAuthProviderPropertyDescriptor;
+import io.cloudbeaver.server.CBPlatform;
 import org.jkiss.dbeaver.Log;

+import java.util.List;
+
 /**
- * Web user.
+ * WebAuthProviderInfo.
 */
 public class WebAuthProviderInfo {

@@ -48,6 +52,14 @@ public class WebAuthProviderInfo {
        return descriptor.getDescription();
    }

+    public boolean isDefaultProvider() {
+        return descriptor.getId().equals(CBPlatform.getInstance().getApplication().getAppConfiguration().getDefaultAuthProvider());
+    }
+
+    public List<WebAuthProviderPropertyDescriptor> getCredentialParameters() {
+        return descriptor.getCredentialParameters();
+    }
+
    @Override
    public String toString() {
        return getId();
@@ -16,6 +16,8 @@
 */
 package io.cloudbeaver.server;

+import io.cloudbeaver.auth.provider.local.LocalAuthProvider;
+
 /**
 * Application configuration
 */
@@ -30,6 +32,7 @@ public class CBAppConfig {
    private boolean supportsUserWorkspaces = false;
    private String[] enabledDrivers = new String[0];
    private String[] disabledDrivers = new String[0];
+    private String defaultAuthProvider = LocalAuthProvider.PROVIDER_ID;

    public boolean isAuthenticationEnabled() {
        return authenticationEnabled;
@@ -70,4 +73,8 @@ public class CBAppConfig {
    public String[] getDisabledDrivers() {
        return disabledDrivers;
    }
+
+    public String getDefaultAuthProvider() {
+        return defaultAuthProvider;
+    }
 }
@@ -49,8 +49,6 @@ public class CBApplication extends BaseApplicationImpl {

    private static final Log log = Log.getLog(CBApplication.class);

-    public static final String APPLICATION_PLUGIN_ID = "io.cloudbeaver.server";
-
    public static CBApplication getInstance() {
        return (CBApplication) BaseApplicationImpl.getInstance();
    }
@@ -66,8 +64,8 @@ public class CBApplication extends BaseApplicationImpl {
    private File homeDirectory;

    private Map<String, Object> productConfiguration = new HashMap<>();
-    private CBAppConfig appConfiguration;
-    private CBDatabaseConfig databaseConfiguration;
+    private CBAppConfig appConfiguration = new CBAppConfig();
+    private CBDatabaseConfig databaseConfiguration = new CBDatabaseConfig();
    private CBDatabase database;
    private CBSecurityController securityController;

@@ -33,10 +33,10 @@ import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBConstants;
+import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.exec.DBCException;
 import org.jkiss.dbeaver.model.runtime.LoggingProgressMonitor;
 import org.jkiss.dbeaver.registry.DataSourceProviderRegistry;
-import org.jkiss.dbeaver.registry.driver.DriverDescriptor;
 import org.jkiss.dbeaver.utils.ContentUtils;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.dbeaver.utils.SystemVariablesResolver;
@@ -82,9 +82,9 @@ public class CBDatabase {

    void initialize() throws DBException {
        if (CommonUtils.isEmpty(databaseConfiguration.getDriver())) {
-            throw new DBException("Database driver not specified");
+            throw new DBException("No database driver configured for CloudBeaver database");
        }
-        DriverDescriptor driver = DataSourceProviderRegistry.getInstance().findDriver(databaseConfiguration.getDriver());
+        DBPDriver driver = DataSourceProviderRegistry.getInstance().findDriver(databaseConfiguration.getDriver());
        if (driver == null) {
            throw new DBException("Driver '" + databaseConfiguration.getDriver() + "' not found");
        }
@@ -17,10 +17,6 @@

 package io.cloudbeaver.server;

-import io.cloudbeaver.DBWebException;
-import io.cloudbeaver.WebServiceUtils;
-import io.cloudbeaver.model.WebDataSourceConfig;
-import io.cloudbeaver.model.WebServerConfig;
 import io.cloudbeaver.model.session.WebSessionManager;
 import io.cloudbeaver.registry.WebDriverRegistry;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -29,9 +25,11 @@ import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.DBPExternalFileManager;
-import org.jkiss.dbeaver.model.app.*;
+import org.jkiss.dbeaver.model.app.DBACertificateStorage;
+import org.jkiss.dbeaver.model.app.DBASecureStorage;
+import org.jkiss.dbeaver.model.app.DBPResourceHandler;
+import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.connection.DBPDataSourceProviderDescriptor;
 import org.jkiss.dbeaver.model.connection.DBPDataSourceProviderRegistry;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
@@ -157,10 +155,12 @@ public class CBPlatform extends BasePlatformImpl {
                    continue;
                }
                List<? extends DBPDriverLibrary> libraries = driver.getDriverLibraries();
-                if (!libraries.isEmpty()) {
+                {
                    boolean hasAllFiles = true;
                    for (DBPDriverLibrary lib : libraries) {
-                        if (!lib.isOptional() && (lib.getLocalFile() == null || !lib.getLocalFile().exists())) {
+                        if (!lib.isOptional() && lib.getType() != DBPDriverLibrary.FileType.license &&
+                            (lib.getLocalFile() == null || !lib.getLocalFile().exists()))
+                        {
                            hasAllFiles = false;
                            log.error("\tDriver '" + driver.getId() + "' is missing library '" + lib.getDisplayName() + "'");
                            break;
@@ -172,7 +172,7 @@ public class CBPlatform extends BasePlatformImpl {
                }
            }
        }
-        log.info("Available drivers: " + applicableDrivers.stream().map(DBPDriver::getId).collect(Collectors.joining(",")));
+        log.info("Available drivers: " + applicableDrivers.stream().map(DBPDriver::getFullName).collect(Collectors.joining(",")));

        sessionManager = WebSessionManager.getInstance();

@@ -62,7 +62,7 @@ public class CBResourceHandler implements DBPResourceHandler {

    @Override
    public String getResourceNodeName(IResource resource) {
-        return resource.toString();
+        return resource.getName();
    }

    @NotNull
@@ -148,7 +148,7 @@ class CBSecurityController implements DBWSecurityController {
                String propertyName = cred.getKey();
                WebAuthProviderPropertyDescriptor property = authProvider.getCredentialParameter(propertyName);
                if (property == null) {
-                    throw new IllegalArgumentException("Invalid auth provider '" + authProvider.getId() + "' property '" + propertyName + "'");
+                    return null;
                }
                String encodedValue = CommonUtils.toString(cred.getValue());
                encodedValue = property.getEncryption().encrypt(userId, encodedValue);
@@ -162,6 +162,9 @@ class CBSecurityController implements DBWSecurityController {
            if (!CommonUtils.isEmpty(credentials)) {
                try (PreparedStatement dbStat = dbCon.prepareStatement("INSERT INTO CB_USER_CREDENTIALS(USER_ID,PROVIDER_ID,CRED_ID,CRED_VALUE) VALUES(?,?,?,?)")) {
                    for (String[] cred : transformedCredentials) {
+                        if (cred == null) {
+                            continue;
+                        }
                        dbStat.setString(1, userId);
                        dbStat.setString(2, authProvider.getId());
                        dbStat.setString(3, cred[0]);
@@ -377,7 +380,7 @@ class CBSecurityController implements DBWSecurityController {
        try (Connection dbCon = database.openConnection()) {
            Set<String> permissions = new HashSet<>();
            try (PreparedStatement dbStat = dbCon.prepareStatement(
-                "SELECT UNIQUE AP.PERMISSION_ID FROM CB_AUTH_PERMISSIONS AP,CB_USER_ROLE UR\n" +
+                "SELECT DISTINCT AP.PERMISSION_ID FROM CB_AUTH_PERMISSIONS AP,CB_USER_ROLE UR\n" +
                    "WHERE UR.ROLE_ID=AP.SUBJECT_ID AND UR.USER_ID=?")) {
                dbStat.setString(1, userId);
                try (ResultSet dbResult = dbStat.executeQuery()) {
@@ -397,7 +400,7 @@ class CBSecurityController implements DBWSecurityController {
            permissions.addAll(getSubjectPermissions(userId));
            return permissions;
        } catch (SQLException e) {
-            throw new DBCException("Error saving role in database", e);
+            throw new DBCException("Error reading user permissions", e);
        }
    }

@@ -21,11 +21,9 @@ import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.WebAction;
 import io.cloudbeaver.model.*;
 import io.cloudbeaver.model.session.WebSession;
-import org.jkiss.dbeaver.model.exec.DBCException;

 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
-import java.util.Set;

 /**
 * Web service API
@@ -41,7 +39,7 @@ public interface DBWServiceCore extends DBWService {
    @WebAction
    List<WebDataSourceConfig> getGlobalDataSources() throws DBWebException;

-    @WebAction
+    @WebAction(requirePermissions = {})
    String[] getSessionPermissions(WebSession webSession) throws DBWebException;

    ///////////////////////////////////////////
@@ -50,16 +48,16 @@ public interface DBWServiceCore extends DBWService {
    @WebAction(requirePermissions = {})
    WebSession openSession(WebSession webSession) throws DBWebException;

-    @WebAction
+    @WebAction(requirePermissions = {})
    WebSession getSessionState(WebSession webSession) throws DBWebException;

    @WebAction
    List<WebServerMessage> readSessionLog(WebSession webSession, Integer maxEntries, Boolean clearEntries) throws DBWebException;

-    @WebAction
+    @WebAction(requirePermissions = {})
    boolean closeSession(HttpServletRequest request) throws DBWebException;

-    @WebAction
+    @WebAction(requirePermissions = {})
    boolean touchSession(HttpServletRequest request) throws DBWebException;

    @WebAction
@@ -135,7 +135,7 @@ public class WebServiceCore implements DBWServiceCore {
            throw new DBWebException("Datasource '" + dataSourceId + "' not found");
        }

-        DBPDataSourceRegistry sessionRegistry = webSession.getDatabases().getDataSourceRegistry();
+        DBPDataSourceRegistry sessionRegistry = webSession.getDatabasesNode().getDataSourceRegistry();
        DBPDataSourceContainer newDataSource = sessionRegistry.createDataSource(dataSourceTemplate);
        newDataSource.setSavePassword(true);
        ((DataSourceDescriptor)newDataSource).setTemporary(true);
@@ -164,7 +164,7 @@ public class WebServiceCore implements DBWServiceCore {

    @Override
    public WebConnectionInfo createConnection(WebSession webSession, WebConnectionConfig connectionConfig) throws DBWebException {
-        DBPDataSourceRegistry sessionRegistry = webSession.getDatabases().getDataSourceRegistry();
+        DBPDataSourceRegistry sessionRegistry = webSession.getDatabasesNode().getDataSourceRegistry();

        DBPDataSourceContainer newDataSource = makeConnectionInstance(connectionConfig, sessionRegistry);
        if (CommonUtils.isEmpty(newDataSource.getName())) {
@@ -181,7 +181,7 @@ public class WebServiceCore implements DBWServiceCore {

    @Override
    public WebConnectionInfo testConnection(WebSession webSession, WebConnectionConfig connectionConfig) throws DBWebException {
-        DBPDataSourceRegistry sessionRegistry = webSession.getDatabases().getDataSourceRegistry();
+        DBPDataSourceRegistry sessionRegistry = webSession.getDatabasesNode().getDataSourceRegistry();

        DBPDataSourceContainer newDataSource = makeConnectionInstance(connectionConfig, sessionRegistry);
        try {
@@ -216,7 +216,7 @@ public class WebServiceCore implements DBWServiceCore {
            // Disconnect in async mode?
            //new DisconnectJob(connectionInfo.getDataSource()).schedule();
        }
-        webSession.getDatabases().getDataSourceRegistry().removeDataSource(connectionInfo.getDataSourceContainer());
+        webSession.getDatabasesNode().getDataSourceRegistry().removeDataSource(connectionInfo.getDataSourceContainer());
        webSession.removeConnection(connectionInfo);

        return disconnected;
@@ -19,10 +19,10 @@ package io.cloudbeaver.service.navigator.impl;

 import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.model.WebConnectionInfo;
-import io.cloudbeaver.service.navigator.WebDatabaseObjectInfo;
-import io.cloudbeaver.service.navigator.WebNavigatorNodeInfo;
 import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.service.navigator.DBWServiceNavigator;
+import io.cloudbeaver.service.navigator.WebDatabaseObjectInfo;
+import io.cloudbeaver.service.navigator.WebNavigatorNodeInfo;
 import io.cloudbeaver.service.navigator.WebStructContainers;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
@@ -35,6 +35,7 @@ import org.jkiss.dbeaver.model.navigator.DBNNode;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.struct.DBSObject;
 import org.jkiss.dbeaver.model.struct.rdb.DBSCatalog;
+import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;

 import java.lang.reflect.InvocationTargetException;
@@ -53,18 +54,36 @@ public class WebServiceNavigator implements DBWServiceNavigator {
        try {
            DBRProgressMonitor monitor = session.getProgressMonitor();

-            DBNNode parentNode = CommonUtils.isEmpty(parentPath) || "/".equals(parentPath) ? session.getDatabases() : session.getNavigatorModel().getNodeByPath(monitor, parentPath);
-            if (parentNode == null) {
-                throw new DBWebException("Node '" + parentPath + "' not found");
+            DBNNode[] nodeChildren;
+            boolean isRootPath = CommonUtils.isEmpty(parentPath) || "/".equals(parentPath);
+            if (isRootPath) {
+                nodeChildren = session.getDatabasesNode().getChildren(monitor);
+                // Inject extra nodes
+                List<DBNNode> extraNodes = session.getProjectNode().getExtraNodes();
+                if (!extraNodes.isEmpty()) {
+                    nodeChildren = ArrayUtils.concatArrays(extraNodes.toArray(new DBNNode[0]), nodeChildren);
+                }
+            } else {
+                DBNNode parentNode = session.getNavigatorModel().getNodeByPath(monitor, parentPath);
+                if (parentNode == null) {
+                    throw new DBWebException("Node '" + parentPath + "' not found");
+                }
+                if (!parentNode.hasChildren(true)) {
+                    return EMPTY_NODE_LIST;
+                }
+                nodeChildren = parentNode.getChildren(monitor);
            }
-            if (!parentNode.hasChildren(true)) {
-                return EMPTY_NODE_LIST;
-            }
-            DBNNode[] nodeChildren = parentNode.getChildren(monitor);
            if (nodeChildren == null) {
                return EMPTY_NODE_LIST;
            }
            List<WebNavigatorNodeInfo> result = new ArrayList<>();
+            if (isRootPath) {
+                // Add navigator extensions
+                for (DBNNode extraNode : session.getNavigatorModel().getRoot().getExtraNodes()) {
+                    result.add(new WebNavigatorNodeInfo(session, extraNode));
+                }
+            }
+
            for (DBNNode node : nodeChildren) {
                if (!CommonUtils.toBoolean(onlyFolders) || node instanceof DBNContainer) {
                    result.add(new WebNavigatorNodeInfo(session, node));
@@ -11,3 +11,4 @@ Bundle-ClassPath: .
 Require-Bundle: io.cloudbeaver.server
 Bundle-Localization: OSGI-INF/l10n/bundle
 Automatic-Module-Name: io.cloudbeaver.service.auth
+Export-Package: io.cloudbeaver.service.auth
@@ -9,13 +9,11 @@ type AuthCredentialInfo {
    displayName: String!
    description: String

-    editable: Boolean
-    identifying: Boolean
    # This field must be shown in admin panel
    admin: Boolean
    # This field must be shown in login form
    user: Boolean
-    possibleValues: [String]!
+    possibleValues: [String]
    encryption: AuthCredentialEncryption
 }

@@ -25,11 +23,11 @@ type AuthProviderInfo {
    icon: ID
    description: String

-    isDefault: Boolean
+    defaultProvider: Boolean

-    configurationParameters: [ObjectPropertyInfo]!
+    #configurationParameters: [ObjectPropertyInfo]!

-    credentialParameters: [AuthCredentialInfo]!
+    credentialParameters: [AuthCredentialInfo!]!
 }

 type UserAuthInfo {
@@ -48,12 +46,12 @@ type UserAuthInfo {

 extend type Query {

-    authLogin(provider: ID!, credentials: Object!): UserAuthInfo
+    authLogin(provider: ID!, credentials: Object!): UserAuthInfo!

    authLogout: Boolean

    sessionUser: UserAuthInfo

-    authProviders: [AuthProviderInfo]!
+    authProviders: [AuthProviderInfo!]!

 }
@@ -20,6 +20,7 @@ import io.cloudbeaver.DBWService;
 import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.WebAction;
 import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.model.user.WebAuthProviderInfo;

 import java.util.Map;

@@ -28,10 +29,17 @@ import java.util.Map;
 */
 public interface DBWServiceAuth extends DBWService {

+    String ATTR_USER_AUTH = "user-auth-info";
+
    @WebAction(requirePermissions = {} )
    WebAuthInfo authLogin(WebSession webSession, String providerId, Map<String, Object> credentials) throws DBWebException;

    @WebAction()
    void authLogout(WebSession webSession) throws DBWebException;

+    @WebAction(requirePermissions = {})
+    WebAuthInfo sessionUser(WebSession webSession) throws DBWebException;
+
+    @WebAction(requirePermissions = {})
+    WebAuthProviderInfo[] getAuthProviders(WebSession webSession);
 }
@@ -16,11 +16,10 @@
 */
 package io.cloudbeaver.service.auth;

+import io.cloudbeaver.model.session.WebSession;
 import io.cloudbeaver.model.user.WebUser;

-import java.time.LocalDate;
 import java.time.OffsetDateTime;
-import java.util.Date;

 /**
 * WebAuthInfo
@@ -76,4 +75,8 @@ public class WebAuthInfo {
    public void setMessage(String message) {
        this.message = message;
    }
+
+    public static WebAuthInfo getFromSession(WebSession webSession) {
+        return webSession.getAttribute(DBWServiceAuth.ATTR_USER_AUTH);
+    }
 }
@@ -17,7 +17,6 @@
 package io.cloudbeaver.service.auth;

 import io.cloudbeaver.DBWebException;
-import io.cloudbeaver.registry.WebServiceRegistry;
 import io.cloudbeaver.service.DBWBindingContext;
 import io.cloudbeaver.service.WebServiceBindingBase;
 import io.cloudbeaver.service.auth.impl.WebServiceAuthImpl;
@@ -36,21 +35,16 @@ public class WebServiceBindingAuth extends WebServiceBindingBase<DBWServiceAuth>
    @Override
    public void bindWiring(DBWBindingContext model) throws DBWebException {
        model.getQueryType()
-            .dataFetcher("authLogin", env -> {
-                return getService(env).authLogin(
-                    getWebSession(env),
-                    env.getArgument("provider"),
-                    env.getArgument("credentials"));
-            })
+            .dataFetcher("authLogin", env -> getService(env).authLogin(
+                getWebSession(env),
+                env.getArgument("provider"),
+                env.getArgument("credentials")))
            .dataFetcher("authLogout", env -> {
                getService(env).authLogout(getWebSession(env));
                return true;
            })
-            .dataFetcher("sessionUser", env -> {
-                Object context = env.getContext();
-                throw new DBWebException("Not implemented");
-            })
-            .dataFetcher("authProviders", env -> WebServiceRegistry.getInstance().getAuthProviders())
+            .dataFetcher("sessionUser", env -> getService(env).sessionUser(getWebSession(env)))
+            .dataFetcher("authProviders", env -> getService(env).getAuthProviders(getWebSession(env)))
        ;

    }
@@ -21,6 +21,7 @@ import io.cloudbeaver.DBWAuthProviderExternal;
 import io.cloudbeaver.DBWSecurityController;
 import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.model.user.WebAuthProviderInfo;
 import io.cloudbeaver.model.user.WebUser;
 import io.cloudbeaver.registry.WebAuthProviderDescriptor;
 import io.cloudbeaver.registry.WebServiceRegistry;
@@ -100,6 +101,8 @@ public class WebServiceAuthImpl implements DBWServiceAuth {
            authInfo.setAuthToken(authToken);
            authInfo.setMessage("Authenticated with " + authProvider.getLabel() + " provider");

+            webSession.setAttribute(ATTR_USER_AUTH, authInfo);
+
            return authInfo;
        } catch (DBException e) {
            throw new DBWebException("User authentication failed", e);
@@ -113,4 +116,20 @@ public class WebServiceAuthImpl implements DBWServiceAuth {
        }
        webSession.setUser(null);
    }
+
+    @Override
+    public WebAuthInfo sessionUser(WebSession webSession) throws DBWebException {
+        if (webSession.getUser() == null) {
+            return null;
+        }
+        return webSession.getAttribute(ATTR_USER_AUTH);
+    }
+
+    @Override
+    public WebAuthProviderInfo[] getAuthProviders(WebSession webSession) {
+        return WebServiceRegistry.getInstance().getAuthProviders()
+            .stream().map(WebAuthProviderInfo::new)
+            .toArray(WebAuthProviderInfo[]::new);
+    }
+
 }
@@ -29,7 +29,7 @@ input DataTransferParameters {
 extend type Query {

    # Available transfer processors
-    dataTransferAvailableStreamProcessors: [ DataTransferProcessorInfo ]
+    dataTransferAvailableStreamProcessors: [ DataTransferProcessorInfo! ]!

    dataTransferExportDataFromContainer(
        connectionId: ID!,
@@ -21,6 +21,8 @@

        <module>io.cloudbeaver.resources.drivers.base</module>
        <module>io.cloudbeaver.connect.provider.sample</module>
+
+        <module>io.cloudbeaver.product.ce</module>
    </modules>

 </project>
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>drivers.clickhouse</artifactId>
+    <version>1.0.0</version>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>drivers</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <properties>
+        <deps.output.dir>clickhouse</deps.output.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>ru.yandex.clickhouse</groupId>
+            <artifactId>clickhouse-jdbc</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+    </dependencies>
+
+</project>
@@ -0,0 +1,35 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>drivers.derby</artifactId>
+    <version>1.0.0</version>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>drivers</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <properties>
+        <deps.output.dir>derby</deps.output.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbytools</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbyshared</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+    </dependencies>
+
+</project>
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>drivers.h2</artifactId>
+    <version>1.0.0</version>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>drivers</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <properties>
+        <deps.output.dir>h2</deps.output.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.199</version>
+        </dependency>
+    </dependencies>
+
+</project>
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>drivers.firebird</artifactId>
+    <version>1.0.0</version>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>drivers</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <properties>
+        <deps.output.dir>jaybird</deps.output.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.firebirdsql.jdbc</groupId>
+            <artifactId>jaybird</artifactId>
+            <version>4.0.0.java8</version>
+        </dependency>
+    </dependencies>
+
+</project>
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>drivers.mariadb</artifactId>
+    <version>1.0.0</version>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>drivers</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <properties>
+        <deps.output.dir>mariadb</deps.output.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>2.4.3</version>
+        </dependency>
+    </dependencies>
+
+</project>
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>drivers.mysql</artifactId>
+    <version>1.0.0</version>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>drivers</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <properties>
+        <deps.output.dir>mysql/mysql8</deps.output.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.17</version>
+        </dependency>
+    </dependencies>
+
+</project>
@@ -0,0 +1,57 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>io.cloudbeaver</groupId>
+    <artifactId>drivers</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+
+    <properties>
+        <deps.output.dir>output</deps.output.dir>
+    </properties>
+
+    <modules>
+        <module>clickhouse</module>
+        <module>derby</module>
+        <module>h2</module>
+        <module>jaybird</module>
+        <module>mysql</module>
+        <module>mariadb</module>
+        <module>postgresql</module>
+        <module>sqlite</module>
+    </modules>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.0</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.8</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <useSubDirectoryPerArtifact>false</useSubDirectoryPerArtifact>
+                            <outputDirectory>../../../deploy/drivers/${deps.output.dir}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+    </build>
+
+</project>
@@ -0,0 +1,30 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>drivers.postgresql</artifactId>
+    <version>1.0.0</version>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>drivers</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <properties>
+        <deps.output.dir>postgresql</deps.output.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>42.2.5</version>
+        </dependency>
+        <dependency>
+            <groupId>net.postgis</groupId>
+            <artifactId>postgis-jdbc</artifactId>
+            <version>2.2.1</version>
+        </dependency>
+    </dependencies>
+
+</project>
@@ -0,0 +1,25 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>drivers.sqlite</artifactId>
+    <version>1.0.0</version>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>drivers</artifactId>
+        <version>1.0.0</version>
+        <relativePath>../</relativePath>
+    </parent>
+
+    <properties>
+        <deps.output.dir>sqlite/xerial</deps.output.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+            <version>RELEASE</version>
+        </dependency>
+    </dependencies>
+
+</project>
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+               feature.properties
+root = target/generated
@@ -0,0 +1,207 @@
+featureName=Cloudbeaver CE
+providerName=DBeaver Corp
+description=Cloudbeaver server feature
+copyright=(c) DBeaver Corp, 2020
+licenseURL=../../docs/licenses/dbeaver_license.txt
+license=\
+                                 Apache License\n\
+                           Version 2.0, January 2004\n\
+                        http://www.apache.org/licenses/\n\
+\n\
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\
+\n\
+   1. Definitions.\n\
+\n\
+      "License" shall mean the terms and conditions for use, reproduction,\n\
+      and distribution as defined by Sections 1 through 9 of this document.\n\
+\n\
+      "Licensor" shall mean the copyright owner or entity authorized by\n\
+      the copyright owner that is granting the License.\n\
+\n\
+      "Legal Entity" shall mean the union of the acting entity and all\n\
+      other entities that control, are controlled by, or are under common\n\
+      control with that entity. For the purposes of this definition,\n\
+      "control" means (i) the power, direct or indirect, to cause the\n\
+      direction or management of such entity, whether by contract or\n\
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n\
+      outstanding shares, or (iii) beneficial ownership of such entity.\n\
+\n\
+      "You" (or "Your") shall mean an individual or Legal Entity\n\
+      exercising permissions granted by this License.\n\
+\n\
+      "Source" form shall mean the preferred form for making modifications,\n\
+      including but not limited to software source code, documentation\n\
+      source, and configuration files.\n\
+\n\
+      "Object" form shall mean any form resulting from mechanical\n\
+      transformation or translation of a Source form, including but\n\
+      not limited to compiled object code, generated documentation,\n\
+      and conversions to other media types.\n\
+\n\
+      "Work" shall mean the work of authorship, whether in Source or\n\
+      Object form, made available under the License, as indicated by a\n\
+      copyright notice that is included in or attached to the work\n\
+      (an example is provided in the Appendix below).\n\
+\n\
+      "Derivative Works" shall mean any work, whether in Source or Object\n\
+      form, that is based on (or derived from) the Work and for which the\n\
+      editorial revisions, annotations, elaborations, or other modifications\n\
+      represent, as a whole, an original work of authorship. For the purposes\n\
+      of this License, Derivative Works shall not include works that remain\n\
+      separable from, or merely link (or bind by name) to the interfaces of,\n\
+      the Work and Derivative Works thereof.\n\
+\n\
+      "Contribution" shall mean any work of authorship, including\n\
+      the original version of the Work and any modifications or additions\n\
+      to that Work or Derivative Works thereof, that is intentionally\n\
+      submitted to Licensor for inclusion in the Work by the copyright owner\n\
+      or by an individual or Legal Entity authorized to submit on behalf of\n\
+      the copyright owner. For the purposes of this definition, "submitted"\n\
+      means any form of electronic, verbal, or written communication sent\n\
+      to the Licensor or its representatives, including but not limited to\n\
+      communication on electronic mailing lists, source code control systems,\n\
+      and issue tracking systems that are managed by, or on behalf of, the\n\
+      Licensor for the purpose of discussing and improving the Work, but\n\
+      excluding communication that is conspicuously marked or otherwise\n\
+      designated in writing by the copyright owner as "Not a Contribution."\n\
+\n\
+      "Contributor" shall mean Licensor and any individual or Legal Entity\n\
+      on behalf of whom a Contribution has been received by Licensor and\n\
+      subsequently incorporated within the Work.\n\
+\n\
+   2. Grant of Copyright License. Subject to the terms and conditions of\n\
+      this License, each Contributor hereby grants to You a perpetual,\n\
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
+      copyright license to reproduce, prepare Derivative Works of,\n\
+      publicly display, publicly perform, sublicense, and distribute the\n\
+      Work and such Derivative Works in Source or Object form.\n\
+\n\
+   3. Grant of Patent License. Subject to the terms and conditions of\n\
+      this License, each Contributor hereby grants to You a perpetual,\n\
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
+      (except as stated in this section) patent license to make, have made,\n\
+      use, offer to sell, sell, import, and otherwise transfer the Work,\n\
+      where such license applies only to those patent claims licensable\n\
+      by such Contributor that are necessarily infringed by their\n\
+      Contribution(s) alone or by combination of their Contribution(s)\n\
+      with the Work to which such Contribution(s) was submitted. If You\n\
+      institute patent litigation against any entity (including a\n\
+      cross-claim or counterclaim in a lawsuit) alleging that the Work\n\
+      or a Contribution incorporated within the Work constitutes direct\n\
+      or contributory patent infringement, then any patent licenses\n\
+      granted to You under this License for that Work shall terminate\n\
+      as of the date such litigation is filed.\n\
+\n\
+   4. Redistribution. You may reproduce and distribute copies of the\n\
+      Work or Derivative Works thereof in any medium, with or without\n\
+      modifications, and in Source or Object form, provided that You\n\
+      meet the following conditions:\n\
+\n\
+      (a) You must give any other recipients of the Work or\n\
+          Derivative Works a copy of this License; and\n\
+\n\
+      (b) You must cause any modified files to carry prominent notices\n\
+          stating that You changed the files; and\n\
+\n\
+      (c) You must retain, in the Source form of any Derivative Works\n\
+          that You distribute, all copyright, patent, trademark, and\n\
+          attribution notices from the Source form of the Work,\n\
+          excluding those notices that do not pertain to any part of\n\
+          the Derivative Works; and\n\
+\n\
+      (d) If the Work includes a "NOTICE" text file as part of its\n\
+          distribution, then any Derivative Works that You distribute must\n\
+          include a readable copy of the attribution notices contained\n\
+          within such NOTICE file, excluding those notices that do not\n\
+          pertain to any part of the Derivative Works, in at least one\n\
+          of the following places: within a NOTICE text file distributed\n\
+          as part of the Derivative Works; within the Source form or\n\
+          documentation, if provided along with the Derivative Works; or,\n\
+          within a display generated by the Derivative Works, if and\n\
+          wherever such third-party notices normally appear. The contents\n\
+          of the NOTICE file are for informational purposes only and\n\
+          do not modify the License. You may add Your own attribution\n\
+          notices within Derivative Works that You distribute, alongside\n\
+          or as an addendum to the NOTICE text from the Work, provided\n\
+          that such additional attribution notices cannot be construed\n\
+          as modifying the License.\n\
+\n\
+      You may add Your own copyright statement to Your modifications and\n\
+      may provide additional or different license terms and conditions\n\
+      for use, reproduction, or distribution of Your modifications, or\n\
+      for any such Derivative Works as a whole, provided Your use,\n\
+      reproduction, and distribution of the Work otherwise complies with\n\
+      the conditions stated in this License.\n\
+\n\
+   5. Submission of Contributions. Unless You explicitly state otherwise,\n\
+      any Contribution intentionally submitted for inclusion in the Work\n\
+      by You to the Licensor shall be under the terms and conditions of\n\
+      this License, without any additional terms or conditions.\n\
+      Notwithstanding the above, nothing herein shall supersede or modify\n\
+      the terms of any separate license agreement you may have executed\n\
+      with Licensor regarding such Contributions.\n\
+\n\
+   6. Trademarks. This License does not grant permission to use the trade\n\
+      names, trademarks, service marks, or product names of the Licensor,\n\
+      except as required for reasonable and customary use in describing the\n\
+      origin of the Work and reproducing the content of the NOTICE file.\n\
+\n\
+   7. Disclaimer of Warranty. Unless required by applicable law or\n\
+      agreed to in writing, Licensor provides the Work (and each\n\
+      Contributor provides its Contributions) on an "AS IS" BASIS,\n\
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n\
+      implied, including, without limitation, any warranties or conditions\n\
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n\
+      PARTICULAR PURPOSE. You are solely responsible for determining the\n\
+      appropriateness of using or redistributing the Work and assume any\n\
+      risks associated with Your exercise of permissions under this License.\n\
+\n\
+   8. Limitation of Liability. In no event and under no legal theory,\n\
+      whether in tort (including negligence), contract, or otherwise,\n\
+      unless required by applicable law (such as deliberate and grossly\n\
+      negligent acts) or agreed to in writing, shall any Contributor be\n\
+      liable to You for damages, including any direct, indirect, special,\n\
+      incidental, or consequential damages of any character arising as a\n\
+      result of this License or out of the use or inability to use the\n\
+      Work (including but not limited to damages for loss of goodwill,\n\
+      work stoppage, computer failure or malfunction, or any and all\n\
+      other commercial damages or losses), even if such Contributor\n\
+      has been advised of the possibility of such damages.\n\
+\n\
+   9. Accepting Warranty or Additional Liability. While redistributing\n\
+      the Work or Derivative Works thereof, You may choose to offer,\n\
+      and charge a fee for, acceptance of support, warranty, indemnity,\n\
+      or other liability obligations and/or rights consistent with this\n\
+      License. However, in accepting such obligations, You may act only\n\
+      on Your own behalf and on Your sole responsibility, not on behalf\n\
+      of any other Contributor, and only if You agree to indemnify,\n\
+      defend, and hold each Contributor harmless for any liability\n\
+      incurred by, or claims asserted against, such Contributor by reason\n\
+      of your accepting any such warranty or additional liability.\n\
+\n\
+   END OF TERMS AND CONDITIONS\n\
+\n\
+   APPENDIX: How to apply the Apache License to your work.\n\
+\n\
+      To apply the Apache License to your work, attach the following\n\
+      boilerplate notice, with the fields enclosed by brackets "[]"\n\
+      replaced with your own identifying information. (Don't include\n\
+      the brackets!)  The text should be enclosed in the appropriate\n\
+      comment syntax for the file format. We also recommend that a\n\
+      file or class name and description of purpose be included on the\n\
+      same "printed page" as the copyright notice for easier\n\
+      identification within third-party archives.\n\
+\n\
+   Copyright [yyyy] [name of copyright owner]\n\
+\n\
+   Licensed under the Apache License, Version 2.0 (the "License");\n\
+   you may not use this file except in compliance with the License.\n\
+   You may obtain a copy of the License at\n\
+\n\
+       http://www.apache.org/licenses/LICENSE-2.0\n\
+\n\
+   Unless required by applicable law or agreed to in writing, software\n\
+   distributed under the License is distributed on an "AS IS" BASIS,\n\
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\
+   See the License for the specific language governing permissions and\n\
+   limitations under the License.\n\
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+        id="io.cloudbeaver.product.ce.feature"
+        label="%featureName"
+        version="1.0.0.qualifier"
+        provider-name="%providerName"
+        plugin="io.cloudbeaver.product.ce">
+
+    <description>
+        %description
+    </description>
+
+    <copyright>
+        %copyright
+    </copyright>
+
+    <license url="%licenseURL">
+        %license
+    </license>
+
+    <includes id="io.cloudbeaver.server.feature" version="0.0.0"/>
+    <includes id="io.cloudbeaver.sample.feature" version="0.0.0"/>
+    <includes id="io.cloudbeaver.ce.drivers.feature" version="0.0.0"/>
+
+    <plugin id="io.cloudbeaver.product.ce" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+</feature>
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>features</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <artifactId>io.cloudbeaver.product.ce.feature</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>eclipse-feature</packaging>
+
+    <build>
+        <plugins>
+            <!-- Generate and copy .eclipseproduct -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>process-product-info</id>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/generated</outputDirectory>
+                            <overwrite>true</overwrite>
+                            <resources>
+                                <resource>
+                                    <directory>root</directory>
+                                    <includes>
+                                        <include>.eclipseproduct</include>
+                                        <include>readme.txt</include>
+                                    </includes>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                        </configuration>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
@@ -1,3 +1,3 @@
 name=${dbeaver-product}
-id=io.cloudbeaver.product
+id=io.cloudbeaver.product.ce
 version=${dbeaver-version}
@@ -1,3 +1,2 @@
 bin.includes = feature.xml,\
               feature.properties
-root = target/generated
@@ -1,207 +1,4 @@
 featureName=Cloudbeaver Server
 providerName=DBeaver Corp
 description=Cloudbeaver server feature
-copyright=(c) DBeaver Corp, 2019
-licenseURL=../../docs/licenses/dbeaver_license.txt
-license=\
-                                 Apache License\n\
-                           Version 2.0, January 2004\n\
-                        http://www.apache.org/licenses/\n\
-\n\
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\
-\n\
-   1. Definitions.\n\
-\n\
-      "License" shall mean the terms and conditions for use, reproduction,\n\
-      and distribution as defined by Sections 1 through 9 of this document.\n\
-\n\
-      "Licensor" shall mean the copyright owner or entity authorized by\n\
-      the copyright owner that is granting the License.\n\
-\n\
-      "Legal Entity" shall mean the union of the acting entity and all\n\
-      other entities that control, are controlled by, or are under common\n\
-      control with that entity. For the purposes of this definition,\n\
-      "control" means (i) the power, direct or indirect, to cause the\n\
-      direction or management of such entity, whether by contract or\n\
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the\n\
-      outstanding shares, or (iii) beneficial ownership of such entity.\n\
-\n\
-      "You" (or "Your") shall mean an individual or Legal Entity\n\
-      exercising permissions granted by this License.\n\
-\n\
-      "Source" form shall mean the preferred form for making modifications,\n\
-      including but not limited to software source code, documentation\n\
-      source, and configuration files.\n\
-\n\
-      "Object" form shall mean any form resulting from mechanical\n\
-      transformation or translation of a Source form, including but\n\
-      not limited to compiled object code, generated documentation,\n\
-      and conversions to other media types.\n\
-\n\
-      "Work" shall mean the work of authorship, whether in Source or\n\
-      Object form, made available under the License, as indicated by a\n\
-      copyright notice that is included in or attached to the work\n\
-      (an example is provided in the Appendix below).\n\
-\n\
-      "Derivative Works" shall mean any work, whether in Source or Object\n\
-      form, that is based on (or derived from) the Work and for which the\n\
-      editorial revisions, annotations, elaborations, or other modifications\n\
-      represent, as a whole, an original work of authorship. For the purposes\n\
-      of this License, Derivative Works shall not include works that remain\n\
-      separable from, or merely link (or bind by name) to the interfaces of,\n\
-      the Work and Derivative Works thereof.\n\
-\n\
-      "Contribution" shall mean any work of authorship, including\n\
-      the original version of the Work and any modifications or additions\n\
-      to that Work or Derivative Works thereof, that is intentionally\n\
-      submitted to Licensor for inclusion in the Work by the copyright owner\n\
-      or by an individual or Legal Entity authorized to submit on behalf of\n\
-      the copyright owner. For the purposes of this definition, "submitted"\n\
-      means any form of electronic, verbal, or written communication sent\n\
-      to the Licensor or its representatives, including but not limited to\n\
-      communication on electronic mailing lists, source code control systems,\n\
-      and issue tracking systems that are managed by, or on behalf of, the\n\
-      Licensor for the purpose of discussing and improving the Work, but\n\
-      excluding communication that is conspicuously marked or otherwise\n\
-      designated in writing by the copyright owner as "Not a Contribution."\n\
-\n\
-      "Contributor" shall mean Licensor and any individual or Legal Entity\n\
-      on behalf of whom a Contribution has been received by Licensor and\n\
-      subsequently incorporated within the Work.\n\
-\n\
-   2. Grant of Copyright License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      copyright license to reproduce, prepare Derivative Works of,\n\
-      publicly display, publicly perform, sublicense, and distribute the\n\
-      Work and such Derivative Works in Source or Object form.\n\
-\n\
-   3. Grant of Patent License. Subject to the terms and conditions of\n\
-      this License, each Contributor hereby grants to You a perpetual,\n\
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n\
-      (except as stated in this section) patent license to make, have made,\n\
-      use, offer to sell, sell, import, and otherwise transfer the Work,\n\
-      where such license applies only to those patent claims licensable\n\
-      by such Contributor that are necessarily infringed by their\n\
-      Contribution(s) alone or by combination of their Contribution(s)\n\
-      with the Work to which such Contribution(s) was submitted. If You\n\
-      institute patent litigation against any entity (including a\n\
-      cross-claim or counterclaim in a lawsuit) alleging that the Work\n\
-      or a Contribution incorporated within the Work constitutes direct\n\
-      or contributory patent infringement, then any patent licenses\n\
-      granted to You under this License for that Work shall terminate\n\
-      as of the date such litigation is filed.\n\
-\n\
-   4. Redistribution. You may reproduce and distribute copies of the\n\
-      Work or Derivative Works thereof in any medium, with or without\n\
-      modifications, and in Source or Object form, provided that You\n\
-      meet the following conditions:\n\
-\n\
-      (a) You must give any other recipients of the Work or\n\
-          Derivative Works a copy of this License; and\n\
-\n\
-      (b) You must cause any modified files to carry prominent notices\n\
-          stating that You changed the files; and\n\
-\n\
-      (c) You must retain, in the Source form of any Derivative Works\n\
-          that You distribute, all copyright, patent, trademark, and\n\
-          attribution notices from the Source form of the Work,\n\
-          excluding those notices that do not pertain to any part of\n\
-          the Derivative Works; and\n\
-\n\
-      (d) If the Work includes a "NOTICE" text file as part of its\n\
-          distribution, then any Derivative Works that You distribute must\n\
-          include a readable copy of the attribution notices contained\n\
-          within such NOTICE file, excluding those notices that do not\n\
-          pertain to any part of the Derivative Works, in at least one\n\
-          of the following places: within a NOTICE text file distributed\n\
-          as part of the Derivative Works; within the Source form or\n\
-          documentation, if provided along with the Derivative Works; or,\n\
-          within a display generated by the Derivative Works, if and\n\
-          wherever such third-party notices normally appear. The contents\n\
-          of the NOTICE file are for informational purposes only and\n\
-          do not modify the License. You may add Your own attribution\n\
-          notices within Derivative Works that You distribute, alongside\n\
-          or as an addendum to the NOTICE text from the Work, provided\n\
-          that such additional attribution notices cannot be construed\n\
-          as modifying the License.\n\
-\n\
-      You may add Your own copyright statement to Your modifications and\n\
-      may provide additional or different license terms and conditions\n\
-      for use, reproduction, or distribution of Your modifications, or\n\
-      for any such Derivative Works as a whole, provided Your use,\n\
-      reproduction, and distribution of the Work otherwise complies with\n\
-      the conditions stated in this License.\n\
-\n\
-   5. Submission of Contributions. Unless You explicitly state otherwise,\n\
-      any Contribution intentionally submitted for inclusion in the Work\n\
-      by You to the Licensor shall be under the terms and conditions of\n\
-      this License, without any additional terms or conditions.\n\
-      Notwithstanding the above, nothing herein shall supersede or modify\n\
-      the terms of any separate license agreement you may have executed\n\
-      with Licensor regarding such Contributions.\n\
-\n\
-   6. Trademarks. This License does not grant permission to use the trade\n\
-      names, trademarks, service marks, or product names of the Licensor,\n\
-      except as required for reasonable and customary use in describing the\n\
-      origin of the Work and reproducing the content of the NOTICE file.\n\
-\n\
-   7. Disclaimer of Warranty. Unless required by applicable law or\n\
-      agreed to in writing, Licensor provides the Work (and each\n\
-      Contributor provides its Contributions) on an "AS IS" BASIS,\n\
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n\
-      implied, including, without limitation, any warranties or conditions\n\
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n\
-      PARTICULAR PURPOSE. You are solely responsible for determining the\n\
-      appropriateness of using or redistributing the Work and assume any\n\
-      risks associated with Your exercise of permissions under this License.\n\
-\n\
-   8. Limitation of Liability. In no event and under no legal theory,\n\
-      whether in tort (including negligence), contract, or otherwise,\n\
-      unless required by applicable law (such as deliberate and grossly\n\
-      negligent acts) or agreed to in writing, shall any Contributor be\n\
-      liable to You for damages, including any direct, indirect, special,\n\
-      incidental, or consequential damages of any character arising as a\n\
-      result of this License or out of the use or inability to use the\n\
-      Work (including but not limited to damages for loss of goodwill,\n\
-      work stoppage, computer failure or malfunction, or any and all\n\
-      other commercial damages or losses), even if such Contributor\n\
-      has been advised of the possibility of such damages.\n\
-\n\
-   9. Accepting Warranty or Additional Liability. While redistributing\n\
-      the Work or Derivative Works thereof, You may choose to offer,\n\
-      and charge a fee for, acceptance of support, warranty, indemnity,\n\
-      or other liability obligations and/or rights consistent with this\n\
-      License. However, in accepting such obligations, You may act only\n\
-      on Your own behalf and on Your sole responsibility, not on behalf\n\
-      of any other Contributor, and only if You agree to indemnify,\n\
-      defend, and hold each Contributor harmless for any liability\n\
-      incurred by, or claims asserted against, such Contributor by reason\n\
-      of your accepting any such warranty or additional liability.\n\
-\n\
-   END OF TERMS AND CONDITIONS\n\
-\n\
-   APPENDIX: How to apply the Apache License to your work.\n\
-\n\
-      To apply the Apache License to your work, attach the following\n\
-      boilerplate notice, with the fields enclosed by brackets "[]"\n\
-      replaced with your own identifying information. (Don't include\n\
-      the brackets!)  The text should be enclosed in the appropriate\n\
-      comment syntax for the file format. We also recommend that a\n\
-      file or class name and description of purpose be included on the\n\
-      same "printed page" as the copyright notice for easier\n\
-      identification within third-party archives.\n\
-\n\
-   Copyright [yyyy] [name of copyright owner]\n\
-\n\
-   Licensed under the Apache License, Version 2.0 (the "License");\n\
-   you may not use this file except in compliance with the License.\n\
-   You may obtain a copy of the License at\n\
-\n\
-       http://www.apache.org/licenses/LICENSE-2.0\n\
-\n\
-   Unless required by applicable law or agreed to in writing, software\n\
-   distributed under the License is distributed on an "AS IS" BASIS,\n\
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n\
-   See the License for the specific language governing permissions and\n\
-   limitations under the License.\n\
+copyright=(c) DBeaver Corp, 2020
@@ -14,10 +14,6 @@
        %copyright
    </copyright>

-    <license url="%licenseURL">
-        %license
-    </license>
-
    <requires>
        <import plugin="org.eclipse.core.runtime" version="3.7" match="greaterOrEqual"/>
        <import plugin="org.eclipse.core.expressions" version="0.0.0" match="greaterOrEqual"/>
@@ -1,49 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+    xmlns="http://maven.apache.org/POM/4.0.0"
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>io.cloudbeaver</groupId>
-    <artifactId>features</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-  <artifactId>io.cloudbeaver.server.feature</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-
-  <build>
-    <plugins>
-      <!-- Generate and copy .eclipseproduct -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.6</version>
-        <executions>
-          <execution>
-            <id>process-product-info</id>
-            <phase>generate-resources</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/generated</outputDirectory>
-              <overwrite>true</overwrite>
-              <resources>
-                <resource>
-                  <directory>root</directory>
-                  <includes>
-                    <include>.eclipseproduct</include>
-                    <include>readme.txt</include>
-                  </includes>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.cloudbeaver</groupId>
+        <artifactId>features</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <artifactId>io.cloudbeaver.server.feature</artifactId>
+    <version>1.0.2-SNAPSHOT</version>
+    <packaging>eclipse-feature</packaging>
 </project>
@@ -17,6 +17,8 @@
        <module>io.cloudbeaver.ce.drivers.feature</module>

        <module>io.cloudbeaver.sample.feature</module>
+
+        <module>io.cloudbeaver.product.ce.feature</module>
    </modules>

 </project>
@@ -25,6 +25,7 @@
    <modules>
        <module>bundles</module>
        <module>features</module>
+        <module>drivers</module>

        <!-- Products -->
        <module>product</module>
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>

-<product name="CloudBeaver Web Server" uid="io.cloudbeaver.product" id="io.cloudbeaver.server.product"
-    application="io.cloudbeaver.server.standalone" version="1.0.2.qualifier" useFeatures="true"
+<product name="CloudBeaver ce Server" uid="io.cloudbeaver.product" id="io.cloudbeaver.product.ce.product"
+    application="io.cloudbeaver.product.ce.application" version="1.0.2.qualifier" useFeatures="true"
    includeLaunchers="false">

    <configIni use="default">
@@ -32,9 +32,7 @@
    </plugins>

    <features>
-        <feature id="io.cloudbeaver.server.feature"/>
-        <feature id="io.cloudbeaver.sample.feature"/>
-        <feature id="io.cloudbeaver.ce.drivers.feature"/>
+        <feature id="io.cloudbeaver.product.ce.feature"/>
    </features>

    <configurations>
@@ -2,7 +2,6 @@
 <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
    <setAttribute key="additional_plugins"/>
    <booleanAttribute key="append.args" value="true"/>
-    <stringAttribute key="application" value="io.cloudbeaver.server.standalone"/>
    <booleanAttribute key="askclear" value="true"/>
    <booleanAttribute key="automaticAdd" value="false"/>
    <booleanAttribute key="automaticValidate" value="true"/>
@@ -13,30 +12,236 @@
    <booleanAttribute key="clearwslog" value="false"/>
    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product"/>
    <booleanAttribute key="default" value="false"/>
+    <setAttribute key="deselected_workspace_bundles"/>
    <stringAttribute key="featureDefaultLocation" value="workspace"/>
    <stringAttribute key="featurePluginResolution" value="workspace"/>
    <booleanAttribute key="includeOptional" value="true"/>
    <stringAttribute key="location" value="${workspace_loc}/../runtime-DBeaverWebServer.product"/>
    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -web-config conf/cloudbeaver.conf"/>
    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms40m -Xmx512m"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\devel\my\cloudbeaver\deploy\cloudbeaver\"/>
    <stringAttribute key="pde.version" value="3.3"/>
-    <stringAttribute key="product" value="io.cloudbeaver.server.product"/>
+    <stringAttribute key="product" value="io.cloudbeaver.product.ee.product"/>
    <stringAttribute key="productFile" value="\web-server\DBeaverWebServer.product"/>
    <setAttribute key="selected_features">
        <setEntry value="io.cloudbeaver.ce.drivers.feature:default"/>
+        <setEntry value="io.cloudbeaver.ee.db.feature:default"/>
+        <setEntry value="io.cloudbeaver.ee.drivers.feature:default"/>
+        <setEntry value="io.cloudbeaver.product.ce.feature:default"/>
+        <setEntry value="io.cloudbeaver.product.ee.feature:default"/>
+        <setEntry value="io.cloudbeaver.sample.feature:default"/>
        <setEntry value="io.cloudbeaver.server.feature:default"/>
        <setEntry value="org.jkiss.dbeaver.db.feature:default"/>
        <setEntry value="org.jkiss.dbeaver.runtime.feature:default"/>
    </setAttribute>
-    <stringAttribute key="selected_target_plugins" value="com.github.jsqlparser@default:default,com.google.gson@default:default,com.google.guava*27.1.0.v20190517-1946@default:default,com.ibm.icu.base@default:default,com.jcraft.jsch@default:default,com.jcraft.jzlib@default:default,com.sun.jna*4.5.1.v20190425-1842@default:default,com.sun.jna.platform*4.5.1.v20190425-1842@default:default,javax.annotation@default:default,javax.inject@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.xml@default:default,net.sf.opencsv@default:default,org.apache.batik.constants@default:default,org.apache.batik.css@default:default,org.apache.batik.i18n@default:default,org.apache.batik.util@default:default,org.apache.commons.io@default:default,org.apache.commons.jexl@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.scr@1:true,org.apache.log4j@default:default,org.apache.lucene.analyzers-common*8.0.0.v20190404-1858@default:default,org.apache.lucene.analyzers-smartcn@default:default,org.apache.lucene.core*8.0.0.v20190404-1858@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.apache.xmlgraphics@default:default,org.bouncycastle.bcpkix@default:default,org.bouncycastle.bcprov@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86_64@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions.supplier@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.jdt.annotation*2.2.300.v20190328-1431@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.osgi.compatibility.state@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.team.core@default:default,org.eclipse.text@default:default,org.jkiss.bundle.apache.dbcp@default:default,org.jkiss.bundle.aws@default:default,org.jkiss.bundle.gis@default:default,org.jkiss.bundle.graphql.java@default:default,org.jkiss.bundle.sshj@default:default,org.objectweb.asm*7.1.0.v20190412-2143@default:default,org.slf4j.api*1.7.10.v20170428-1633@default:default,org.tukaani.xz@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,stax.api@default:default"/>
-    <stringAttribute key="selected_workspace_plugins" value="io.cloudbeaver.connect.provider.sample@default:default,io.cloudbeaver.resources.drivers.base@default:default,io.cloudbeaver.resources.drivers.ee@default:default,io.cloudbeaver.server@default:default,io.cloudbeaver.service.admin@default:default,io.cloudbeaver.service.auth.aws@default:default,io.cloudbeaver.service.auth@default:default,io.cloudbeaver.service.data.transfer@default:default,io.cloudbeaver.service.metadata@default:default,org.jkiss.dbeaver.cmp.simple@default:default,org.jkiss.dbeaver.data.gis@default:default,org.jkiss.dbeaver.data.transfer@default:default,org.jkiss.dbeaver.ext.clickhouse@default:default,org.jkiss.dbeaver.ext.db2.i@default:default,org.jkiss.dbeaver.ext.db2.zos@default:default,org.jkiss.dbeaver.ext.derby@default:default,org.jkiss.dbeaver.ext.firebird@default:default,org.jkiss.dbeaver.ext.generic@default:default,org.jkiss.dbeaver.ext.greenplum@default:default,org.jkiss.dbeaver.ext.h2@default:default,org.jkiss.dbeaver.ext.h2gis@default:default,org.jkiss.dbeaver.ext.hana@default:default,org.jkiss.dbeaver.ext.hive@default:default,org.jkiss.dbeaver.ext.hsqldb@default:default,org.jkiss.dbeaver.ext.informix@default:default,org.jkiss.dbeaver.ext.kognitio@default:default,org.jkiss.dbeaver.ext.mssql@default:default,org.jkiss.dbeaver.ext.mysql@default:default,org.jkiss.dbeaver.ext.netezza@default:default,org.jkiss.dbeaver.ext.opendistro@default:default,org.jkiss.dbeaver.ext.oracle@default:default,org.jkiss.dbeaver.ext.phoenix@default:default,org.jkiss.dbeaver.ext.postgresql@default:default,org.jkiss.dbeaver.ext.snowflake.core@default:default,org.jkiss.dbeaver.ext.teradata@default:default,org.jkiss.dbeaver.ext.vertica@default:default,org.jkiss.dbeaver.model.sql@default:default,org.jkiss.dbeaver.model@default:default,org.jkiss.dbeaver.net.ssh.sshj@default:default,org.jkiss.dbeaver.net.ssh@default:default,org.jkiss.dbeaver.registry@default:default,org.jkiss.dbeaver.slf4j@default:false,org.jkiss.dbeaver.tasks.native@default:default,org.jkiss.utils@default:default,org.jkiss.wmi@default:default"/>
+    <setAttribute key="selected_target_bundles">
+        <setEntry value="com.github.jsqlparser@default:default"/>
+        <setEntry value="com.google.gson@default:default"/>
+        <setEntry value="com.google.guava@default:default"/>
+        <setEntry value="com.ibm.icu.base@default:default"/>
+        <setEntry value="com.jcraft.jsch@default:default"/>
+        <setEntry value="com.jcraft.jzlib@default:default"/>
+        <setEntry value="com.sun.jna.platform@default:default"/>
+        <setEntry value="com.sun.jna@default:default"/>
+        <setEntry value="javax.annotation@default:default"/>
+        <setEntry value="javax.inject@default:default"/>
+        <setEntry value="javax.servlet@default:default"/>
+        <setEntry value="javax.xml@default:default"/>
+        <setEntry value="net.sf.opencsv@default:default"/>
+        <setEntry value="org.apache.batik.constants@default:default"/>
+        <setEntry value="org.apache.batik.css*1.11.0.v20190515-0436@default:default"/>
+        <setEntry value="org.apache.batik.i18n@default:default"/>
+        <setEntry value="org.apache.batik.util*1.11.0.v20190515-0436@default:default"/>
+        <setEntry value="org.apache.commons.codec@default:default"/>
+        <setEntry value="org.apache.commons.io@default:default"/>
+        <setEntry value="org.apache.commons.jexl@default:default"/>
+        <setEntry value="org.apache.commons.jxpath@default:default"/>
+        <setEntry value="org.apache.commons.logging@default:default"/>
+        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
+        <setEntry value="org.apache.felix.scr@1:true"/>
+        <setEntry value="org.apache.httpcomponents.httpclient.win@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
+        <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
+        <setEntry value="org.apache.log4j@default:default"/>
+        <setEntry value="org.apache.xerces@default:default"/>
+        <setEntry value="org.apache.xml.resolver@default:default"/>
+        <setEntry value="org.apache.xml.serializer@default:default"/>
+        <setEntry value="org.apache.xmlgraphics@default:default"/>
+        <setEntry value="org.bouncycastle.bcpkix@default:default"/>
+        <setEntry value="org.bouncycastle.bcprov@default:default"/>
+        <setEntry value="org.eclipse.ant.core@default:default"/>
+        <setEntry value="org.eclipse.compare.core@default:default"/>
+        <setEntry value="org.eclipse.core.commands@default:default"/>
+        <setEntry value="org.eclipse.core.contenttype@default:default"/>
+        <setEntry value="org.eclipse.core.databinding.observable@default:default"/>
+        <setEntry value="org.eclipse.core.databinding.property@default:default"/>
+        <setEntry value="org.eclipse.core.databinding@default:default"/>
+        <setEntry value="org.eclipse.core.expressions@default:default"/>
+        <setEntry value="org.eclipse.core.filebuffers@default:default"/>
+        <setEntry value="org.eclipse.core.filesystem.win32.x86_64@default:false"/>
+        <setEntry value="org.eclipse.core.filesystem@default:default"/>
+        <setEntry value="org.eclipse.core.jobs@default:default"/>
+        <setEntry value="org.eclipse.core.net.win32.x86_64@default:false"/>
+        <setEntry value="org.eclipse.core.net@default:default"/>
+        <setEntry value="org.eclipse.core.resources.win32.x86_64@default:false"/>
+        <setEntry value="org.eclipse.core.resources@default:default"/>
+        <setEntry value="org.eclipse.core.runtime@default:true"/>
+        <setEntry value="org.eclipse.core.variables@default:default"/>
+        <setEntry value="org.eclipse.e4.core.commands@default:default"/>
+        <setEntry value="org.eclipse.e4.core.contexts@default:default"/>
+        <setEntry value="org.eclipse.e4.core.di.annotations@default:default"/>
+        <setEntry value="org.eclipse.e4.core.di.extensions.supplier@default:default"/>
+        <setEntry value="org.eclipse.e4.core.di.extensions@default:default"/>
+        <setEntry value="org.eclipse.e4.core.di@default:default"/>
+        <setEntry value="org.eclipse.e4.core.services@default:default"/>
+        <setEntry value="org.eclipse.e4.emf.xpath@default:default"/>
+        <setEntry value="org.eclipse.emf.common@default:default"/>
+        <setEntry value="org.eclipse.emf.ecore.change@default:default"/>
+        <setEntry value="org.eclipse.emf.ecore.edit@default:default"/>
+        <setEntry value="org.eclipse.emf.ecore.xmi@default:default"/>
+        <setEntry value="org.eclipse.emf.ecore@default:default"/>
+        <setEntry value="org.eclipse.emf.edit@default:default"/>
+        <setEntry value="org.eclipse.equinox.app@default:default"/>
+        <setEntry value="org.eclipse.equinox.bidi@default:default"/>
+        <setEntry value="org.eclipse.equinox.common@2:true"/>
+        <setEntry value="org.eclipse.equinox.event@default:default"/>
+        <setEntry value="org.eclipse.equinox.http.jetty@default:default"/>
+        <setEntry value="org.eclipse.equinox.http.servlet@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.core@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.engine@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.metadata.repository@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.metadata@default:default"/>
+        <setEntry value="org.eclipse.equinox.p2.repository@default:default"/>
+        <setEntry value="org.eclipse.equinox.preferences@default:default"/>
+        <setEntry value="org.eclipse.equinox.registry@default:default"/>
+        <setEntry value="org.eclipse.equinox.security.win32.x86_64@default:false"/>
+        <setEntry value="org.eclipse.equinox.security@default:default"/>
+        <setEntry value="org.eclipse.jetty.http@default:default"/>
+        <setEntry value="org.eclipse.jetty.io@default:default"/>
+        <setEntry value="org.eclipse.jetty.security@default:default"/>
+        <setEntry value="org.eclipse.jetty.server@default:default"/>
+        <setEntry value="org.eclipse.jetty.servlet@default:default"/>
+        <setEntry value="org.eclipse.jetty.util@default:default"/>
+        <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
+        <setEntry value="org.eclipse.osgi.services@default:default"/>
+        <setEntry value="org.eclipse.osgi.util@default:default"/>
+        <setEntry value="org.eclipse.osgi@-1:true"/>
+        <setEntry value="org.eclipse.team.core@default:default"/>
+        <setEntry value="org.eclipse.text@default:default"/>
+        <setEntry value="org.jkiss.bundle.apache.dbcp@default:default"/>
+        <setEntry value="org.jkiss.bundle.apache.kerby@default:default"/>
+        <setEntry value="org.jkiss.bundle.apache.poi@default:default"/>
+        <setEntry value="org.jkiss.bundle.aws@default:default"/>
+        <setEntry value="org.jkiss.bundle.bouncycastle@default:default"/>
+        <setEntry value="org.jkiss.bundle.cassandra@default:default"/>
+        <setEntry value="org.jkiss.bundle.couchbase@default:default"/>
+        <setEntry value="org.jkiss.bundle.gis@default:default"/>
+        <setEntry value="org.jkiss.bundle.google.cloud@default:default"/>
+        <setEntry value="org.jkiss.bundle.graphql.java@default:default"/>
+        <setEntry value="org.jkiss.bundle.influxdb@default:default"/>
+        <setEntry value="org.jkiss.bundle.jaxb@default:default"/>
+        <setEntry value="org.jkiss.bundle.jedis@default:default"/>
+        <setEntry value="org.jkiss.bundle.liquibase@default:default"/>
+        <setEntry value="org.jkiss.bundle.onelogin.saml@default:default"/>
+        <setEntry value="org.jkiss.bundle.sshj@default:default"/>
+        <setEntry value="org.mongodb.mongo-java-driver@default:default"/>
+        <setEntry value="org.objectweb.asm@default:default"/>
+        <setEntry value="org.slf4j.api*1.7.2.v20121108-1250@default:default"/>
+        <setEntry value="org.tukaani.xz@default:default"/>
+        <setEntry value="org.w3c.css.sac@default:default"/>
+        <setEntry value="org.w3c.dom.events@default:default"/>
+        <setEntry value="org.w3c.dom.smil@default:default"/>
+        <setEntry value="org.w3c.dom.svg@default:default"/>
+        <setEntry value="stax.api@default:default"/>
+    </setAttribute>
+    <setAttribute key="selected_workspace_bundles">
+        <setEntry value="com.dbeaver.cloud.aws@default:default"/>
+        <setEntry value="com.dbeaver.cloud.model@default:default"/>
+        <setEntry value="com.dbeaver.db.bigtable@default:default"/>
+        <setEntry value="com.dbeaver.db.cassandra@default:default"/>
+        <setEntry value="com.dbeaver.db.couchbase@default:default"/>
+        <setEntry value="com.dbeaver.db.dynamodb@default:default"/>
+        <setEntry value="com.dbeaver.db.influxdb@default:default"/>
+        <setEntry value="com.dbeaver.db.mongodb@default:default"/>
+        <setEntry value="com.dbeaver.db.postgresql.krb5@default:default"/>
+        <setEntry value="com.dbeaver.db.prestodb.krb5@default:default"/>
+        <setEntry value="com.dbeaver.db.prestosql.krb5@default:default"/>
+        <setEntry value="com.dbeaver.db.redis@default:default"/>
+        <setEntry value="com.dbeaver.db.sqlite.crypt@default:default"/>
+        <setEntry value="com.dbeaver.ee.runtime.net@default:default"/>
+        <setEntry value="com.dbeaver.ee.runtime@default:default"/>
+        <setEntry value="com.dbeaver.ee.sched.system@default:default"/>
+        <setEntry value="com.dbeaver.ee.scmp.core@default:default"/>
+        <setEntry value="com.dbeaver.ee.tasks@default:default"/>
+        <setEntry value="com.dbeaver.lm.core@default:default"/>
+        <setEntry value="com.dbeaver.net.auth.iam@default:default"/>
+        <setEntry value="com.dbeaver.net.auth.krb5@default:default"/>
+        <setEntry value="com.dbeaver.net.auth.profile@default:default"/>
+        <setEntry value="com.dbeaver.resources.clients.mysql.win32@default:default"/>
+        <setEntry value="com.dbeaver.resources.clients.postgresql.win32@default:default"/>
+        <setEntry value="com.dbeaver.resources.drivers.jdbc@default:default"/>
+        <setEntry value="io.cloudbeaver.connect.provider.sample@default:default"/>
+        <setEntry value="io.cloudbeaver.product.ee@default:default"/>
+        <setEntry value="io.cloudbeaver.resources.drivers.ee@default:default"/>
+        <setEntry value="io.cloudbeaver.server@default:default"/>
+        <setEntry value="io.cloudbeaver.service.admin@default:default"/>
+        <setEntry value="io.cloudbeaver.service.auth.aws@default:default"/>
+        <setEntry value="io.cloudbeaver.service.auth@default:default"/>
+        <setEntry value="io.cloudbeaver.service.data.transfer@default:default"/>
+        <setEntry value="io.cloudbeaver.service.metadata@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.data.gis@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.data.office@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.data.transfer@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.athena@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.bigquery@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.clickhouse@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.db2.i@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.db2.zos@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.db2@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.derby@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.elasticsearch@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.exasol@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.firebird@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.generic@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.greenplum@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.h2@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.h2gis@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.hana@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.hive@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.hsqldb@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.informix@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.kognitio@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.mssql@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.mysql@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.netezza@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.opendistro@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.oracle@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.phoenix@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.postgresql@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.snowflake.core@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.spanner@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.sqlite@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.teradata@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.ext.vertica@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.model.sql@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.model@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.net.ssh.jsch@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.net.ssh.sshj@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.net.ssh@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.registry@default:default"/>
+        <setEntry value="org.jkiss.dbeaver.slf4j@default:false"/>
+        <setEntry value="org.jkiss.dbeaver.tasks.native@default:default"/>
+        <setEntry value="org.jkiss.lm@default:default"/>
+        <setEntry value="org.jkiss.utils@default:default"/>
+        <setEntry value="org.jkiss.wmi@default:default"/>
+    </setAttribute>
    <booleanAttribute key="show_selected_only" value="false"/>
    <booleanAttribute key="tracing" value="false"/>
    <booleanAttribute key="useCustomFeatures" value="false"/>
    <booleanAttribute key="useDefaultConfig" value="true"/>
-    <booleanAttribute key="useDefaultConfigArea" value="true"/>
+    <booleanAttribute key="useDefaultConfigArea" value="false"/>
    <booleanAttribute key="useProduct" value="true"/>
    <booleanAttribute key="usefeatures" value="false"/>
 </launchConfiguration>
@@ -5,15 +5,12 @@ module.exports = {
    'eslint:recommended',
    'plugin:react/recommended',
    'plugin:@typescript-eslint/recommended',
-    // 'plugin:prettier/recommended',
-    // 'prettier/@typescript-eslint',
  ],

  plugins: [
    'import',
    '@typescript-eslint',
    'eslint-plugin-import-helpers',
-    // 'prettier',
    'jest',
  ],

@@ -37,7 +34,6 @@ module.exports = {
  },

  rules: {
-    // 'prettier/prettier': 'warn',
    'arrow-parens': ['error', 'as-needed', { 'requireForBlockBody': true }],
    'curly': ['error', 'all'],
    'class-methods-use-this': 'off',
@@ -76,12 +72,15 @@ module.exports = {
    'no-restricted-globals': 'off',
    'no-useless-constructor': 'off',
    'max-classes-per-file': 'off',
+    'arrow-body-style': ['error', 'as-needed'],
+    'function-call-argument-newline': ['error', 'consistent'],
    'max-len': [
      'error',
      {
        code: 120,
        ignoreTrailingComments: true,
-        ignoreStrings: true
+        ignoreStrings: true,
+        ignoreTemplateLiterals: true
      }
    ],
    'lines-between-class-members': 'off',
@@ -1,4 +1,5 @@
 .idea
+dist
 node_modules

 yarn-error.log
@@ -1,9 +0,0 @@
-// we use prettier only for graphQL-codegen
-
-module.exports = {
-  useTabs: false,
-  tabWidth: 2,
-  trailingComma: 'all',
-  singleQuote: false,
-  semi: true,
-}
@@ -28,9 +28,10 @@ class IgnoreNotFoundExportPlugin {

 module.exports = (env, argv) => {

-  function generateStyleLoaders(options = { hasModule: false, hasReshadow: false }) {
+  function generateStyleLoaders(options = { hasModule: false }) {
+    const moduleScope = options.hasModule ? 'local' : 'global';
    const modules = {
-      mode: options.hasModule ? 'local' : 'global',
+      mode: moduleScope,
      localIdentName: '[local]___[hash:base64:5]',
    };

@@ -40,12 +41,9 @@ module.exports = (env, argv) => {
        includePaths: ['node_modules', path.resolve('../../node_modules')],
      }),
      require('postcss-discard-comments'),
+      require('reshadow/postcss')({ scopeBehaviour: moduleScope })
    ];

-    if (options.hasReshadow) {
-      postCssPlugins.push(require('reshadow/postcss'));
-    }
-
    // 'use' clause in webpack rules
    return [
      {
@@ -114,12 +112,7 @@ module.exports = (env, argv) => {
            // css-module files ( should have *.module mask )
            {
              test: /\.module\.(css|scss|sass)$/,
-              use: generateStyleLoaders({ hasModule: true, hasReshadow: true }),
-            },
-            // not css-module files - 3 ways to treat them
-            {
-              test: /\.raw\.(css|scss|sass)$/,
-              use: generateStyleLoaders({ hasModule: false, hasReshadow: false }),
+              use: generateStyleLoaders({ hasModule: true }),
            },
            {
              include: /node_modules/,
@@ -134,7 +127,7 @@ module.exports = (env, argv) => {
              ]
            },
            {
-              use: generateStyleLoaders({ hasModule: false, hasReshadow: true }),
+              use: generateStyleLoaders({ hasModule: false }),
            }
          ]
        },
@@ -14,98 +14,32 @@
  "scripts": {
    "bootstrap": "lerna bootstrap",
    "build": "lerna run build --stream",
-    "build-plugin": "lerna run build-plugin --stream --scope @dbeaver/core --scope @dbeaver/basic-connection-plugin",
-    "start": "lerna run start --stream",
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "tsc": "lerna run tsc --stream",
-    "watch": "lerna run watch --stream"
+    "serve": "lerna run serve --stream",
+    "serve-plugin": "lerna run serve-plugin --stream --parallel",
+    "clean-dist": "lerna run clean-dist --stream",
+    "test": "echo \"Error: no test specified\" && exit 1"
  },
  "dependencies": {
    "@babel/runtime": "7.8.4"
  },
  "devDependencies": {
-    "@babel/cli": "^7.7.4",
-    "@babel/core": "^7.7.4",
-    "@babel/plugin-proposal-decorators": "^7.7.4",
-    "@babel/plugin-proposal-optional-chaining": "^7.8.3",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.8.3",
-    "@babel/preset-env": "^7.7.4",
-    "@babel/preset-react": "^7.7.4",
-    "@babel/preset-typescript": "^7.7.4",
-    "@csstools/postcss-sass": "^4.0.0",
-    "@graphql-codegen/add": "^1.8.1",
-    "@graphql-codegen/cli": "^1.8.1",
-    "@graphql-codegen/near-operation-file-preset": "^1.8.0",
-    "@graphql-codegen/typescript": "^1.8.1",
-    "@graphql-codegen/typescript-graphql-files-modules": "^1.8.0",
-    "@graphql-codegen/typescript-graphql-request": "^1.8.1",
-    "@graphql-codegen/typescript-operations": "^1.8.1",
-    "@types/graphql": "^14.5.0",
    "@types/jest": "^24.0.23",
    "@types/node": "^12.7.8",
    "@types/react": "^16.9.34",
    "@types/react-dom": "^16.9.6",
    "@typescript-eslint/eslint-plugin": "^2.5.0",
    "@typescript-eslint/parser": "^2.8.0",
-    "babel-loader": "^8.0.6",
-    "babel-plugin-react-require": "^3.1.1",
-    "babel-plugin-transform-typescript-metadata": "^0.2.2",
-    "circular-dependency-plugin": "^5.2.0",
-    "copy-webpack-plugin": "^5.1.0",
-    "css-loader": "^3.2.1",
    "eslint": "^6.6.0",
    "eslint-config-airbnb-base": "^14.0.0",
-    "eslint-config-prettier": "^6.5.0",
    "eslint-import-resolver-typescript": "^2.0.0",
    "eslint-loader": "^3.0.3",
    "eslint-plugin-import": "^2.18.2",
    "eslint-plugin-import-helpers": "^1.0.2",
    "eslint-plugin-jest": "^22.21.0",
    "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-prettier": "^3.1.1",
    "eslint-plugin-react": "^7.16.0",
    "eslint-plugin-react-hooks": "^1.7.0",
-    "extract-css-chunks-webpack-plugin": "^4.7.1",
-    "file-loader": "^5.0.2",
-    "fork-ts-checker-webpack-plugin": "^4.0.5",
-    "graphql": "^14.5.8",
-    "html-webpack-plugin": "^3.2.0",
-    "http-proxy-middleware": "^0.20.0",
    "lerna": "^3.19.0",
-    "lint-staged": "^9.4.1",
-    "mini-css-extract-plugin": "^0.9.0",
-    "node-sass": "^4.13.0",
-    "peer-deps-externals-webpack-plugin": "^1.0.4",
-    "postcss-discard-comments": "^4.0.2",
-    "postcss-extend-rule": "^3.0.0",
-    "postcss-import": "^12.0.1",
-    "postcss-loader": "^3.0.0",
-    "postcss-scss": "^2.0.0",
-    "prettier": "^1.19.1",
-    "prettier-eslint": "^9.0.0",
-    "raw-loader": "^3.1.0",
-    "react-hot-loader": "^4.12.18",
-    "rimraf": "^3.0.0",
-    "rollup": "^2.0.6",
-    "rollup-plugin-babel": "^4.4.0",
-    "rollup-plugin-commonjs": "^10.1.0",
-    "rollup-plugin-includepaths": "^0.2.3",
-    "rollup-plugin-node-resolve": "^5.2.0",
-    "rollup-plugin-peer-deps-external": "^2.2.2",
-    "rollup-plugin-postcss": "dkrupenya/rollup-plugin-postcss#develop",
-    "rollup-plugin-typescript2": "^0.26.0",
-    "sass-loader": "^8.0.0",
-    "source-map-loader": "^0.2.4",
-    "string-replace-webpack-plugin": "^0.1.3",
-    "style-loader": "^1.0.1",
-    "typescript": "^3.8.3",
-    "uglifyjs-webpack-plugin": "^2.2.0",
-    "url-loader": "^3.0.0",
-    "webpack": "^4.41.2",
-    "webpack-cli": "^3.3.10",
-    "webpack-dev-middleware": "^3.7.2",
-    "webpack-dev-server": "^3.9.0",
-    "webpack-merge": "^4.2.2"
+    "rimraf": "^3.0.0"
  }
 }
@@ -4,28 +4,24 @@
  "description": "",
  "license": "Apache-2.0",
  "main": "dist/index.js",
+  "module": "dist/index.js",
  "scripts": {
-    "build-plugin": "npm run clean-dist && webpack -p --config=../../configs/webpack/build-plugin.js",
+    "build": "npm run clean-dist && builder build-plugin",
+    "serve-plugin": "builder serve-plugin",
    "clean-dist": "rimraf dist/*",
-    "rollup": "npm run clean-dist && rollup --config ../../configs/rollup.config.js",
    "test": "echo \"Error: no test specified\" && exit 1"
  },
+  "devDependencies": {
+    "@dbeaver/core": "^0.1.0"
+  },
  "peerDependencies": {
    "@dbeaver/core": "^0.1.0",
-    "@material/button": "^4.0.0",
-    "@material/elevation": "^4.0.0",
-    "@material/ripple": "^4.0.0",
-    "@material/theme": "^4.0.0",
-    "@material/typography": "^4.0.0",
-    "graphql": "^14.5.8",
-    "graphql-request": "^1.8.2",
-    "graphql-tag": "^2.10.1",
    "mobx": "^5.15.4",
    "mobx-react": "^6.2.2",
    "react": "^16.13.1",
    "react-dom": "^16.13.1",
    "reakit": "^1.0.0-beta.11",
-    "reshadow": "0.0.1-alpha.75",
+    "reshadow": "0.0.1-alpha.77",
    "rxjs": "^6.5.5"
  }
 }
@@ -6,11 +6,14 @@
  "main": "dist/index.js",
  "types": "dist/types",
  "scripts": {
-    "build-plugin": "npm run clean-dist && webpack -p --config=../../configs/webpack/build-plugin.js",
+    "build": "npm run clean-dist && builder build-plugin",
+    "serve-plugin": "builder serve-plugin",
    "clean-dist": "rimraf dist/*",
-    "rollup": "npm run clean-dist && rollup --config ../../configs/rollup.config.js",
    "test": "echo \"Error: no test specified\" && exit 1"
  },
+  "devDependencies": {
+    "@dbeaver/core": "^0.1.0"
+  },
  "peerDependencies": {
    "@dbeaver/core": "^0.1.0",
    "mobx": "^5.15.4",
@@ -18,7 +21,7 @@
    "react": "^16.13.1",
    "react-dom": "^16.13.1",
    "reakit": "^1.0.0-beta.11",
-    "reshadow": "0.0.1-alpha.75",
+    "reshadow": "0.0.1-alpha.77",
    "rxjs": "^6.5.5"
  }
 }
@@ -6,9 +6,9 @@
  "main": "dist/index.js",
  "types": "dist/types",
  "scripts": {
-    "build-plugin": "npm run clean-dist && webpack -p --config=../../configs/webpack/build-plugin.js",
+    "build": "npm run clean-dist && builder build-plugin",
+    "serve-plugin": "builder serve-plugin",
    "clean-dist": "rimraf dist/*",
-    "rollup": "npm run clean-dist && rollup --config ../../configs/rollup.config.js",
    "test": "echo \"Error: no test specified\" && exit 1"
  },
  "dependencies": {
@@ -17,22 +17,17 @@
    "ag-grid-community": "^23.0.2",
    "ag-grid-react": "^23.0.3"
  },
+  "devDependencies": {
+    "@dbeaver/core": "^0.1.0"
+  },
  "peerDependencies": {
    "@dbeaver/core": "^0.1.0",
-    "@material/button": "^4.0.0",
-    "@material/elevation": "^4.0.0",
-    "@material/ripple": "^4.0.0",
-    "@material/theme": "^4.0.0",
-    "@material/typography": "^4.0.0",
-    "graphql": "^14.5.8",
-    "graphql-request": "^1.8.2",
-    "graphql-tag": "^2.10.1",
    "mobx": "^5.15.4",
    "mobx-react": "^6.2.2",
    "react": "^16.13.1",
    "react-dom": "^16.13.1",
    "reakit": "^1.0.0-beta.11",
-    "reshadow": "0.0.1-alpha.75",
+    "reshadow": "0.0.1-alpha.77",
    "rxjs": "^6.5.5"
  }
 }
@@ -31,7 +31,7 @@ export type AgGridTableProps = PropsWithChildren<
  }>

 async function loader() {
-  // const styles = await import('../styles/base.scss');
+  const styles = await import('../styles/base.scss');
  const { AgGridReact } = await import('ag-grid-react');
  const { AllCommunityModules } = await import('@ag-grid-community/all-modules');

@@ -60,7 +60,7 @@ export const AgGridTable = observer(function AgGridTable({
      {({ AgGridReact, AllCommunityModules }) => (
        <Observer>
          {() => styled(styles)(
-            <ag-grid-theme as="div" className={className}>
+            <ag-grid-theme as="div" className={`cb-ag-grid-theme ${className}`}>
              <AgGridReact
                key={controller.refreshId}
                columnDefs={controller.columns}
@@ -461,6 +461,11 @@ export class RangeController implements IRangeController {
      return false;
    }

+    isBottomRightCell(cellRange: CellRange, cell: CellPosition): boolean {
+      console.log('isBottomRightCell');
+      return false;
+    }
+
    isContiguousRange(cellRange: CellRange) {
      console.log('isContiguousRange');
      return false;
@@ -10,11 +10,9 @@
@import "ag-grid-community/src/styles/ag-theme-balham/sass/ag-theme-balham-mixin.scss";
@import "ag-grid-community/src/styles/webfont/agGridAlpineFont.scss";

-:local(.__ag-grid-theme) {
-  composes: ag-theme-balham from global;
-}

-.ag-theme-balham {
+.cb-ag-grid-theme {
+
  @include ag-theme-balham();

  font-family: inherit;
@@ -9,17 +9,16 @@
 import { ThemeSelector } from '@dbeaver/core/theming';

 export const agGridStyles: ThemeSelector = async (theme) => {
-  const baseStyles = await import('./base.raw.scss');
  let styles: any;

  switch (theme) {
    case 'dark':
-      styles = await import('./themes/dark.scss');
+      styles = await import('./themes/dark.module.scss');
      break;
    default:
-      styles = await import('./themes/light.scss');
+      styles = await import('./themes/light.module.scss');
      break;
  }

-  return [baseStyles.default, styles.default];
+  return [styles.default];
 };
@@ -9,54 +9,58 @@
@import "@dbeaver/core/assets/styles/branding";

@mixin base-ag-grid() {
-  .ag-theme-balham {
-    .ag-header {
-      border-bottom: 1px solid;
-      @include mdc-theme-prop(color, on-surface, false);
-      @include mdc-theme-prop(border-color, background, false);
-    }
-    .ag-header-row {
-      @include mdc-theme-prop(color, on-surface, false);
-    }
+  :global {
+    .cb-ag-grid-theme {
+      .ag-header {
+        border-bottom: 1px solid;
+        @include mdc-theme-prop(color, on-surface, false);
+        @include mdc-theme-prop(border-color, background, false);
+      }

-    .ag-row {
-      border-top: none;
-      border-bottom: solid 1px;
-      @include mdc-theme-prop(color, on-surface, false);
-      @include mdc-theme-prop(border-color, background, false);
-    }
+      .ag-header-row {
+        @include mdc-theme-prop(color, on-surface, false);
+      }

-    .ag-row-selected {
-      border-color: #03a9f4;
-      background-color: transparent;
-      @include stripes-background($mdc-theme-secondary);
-    }
+      .ag-row, .ag-row:not(.ag-row-first) {
+        border-top: none;
+        border-bottom: solid 1px;
+        @include mdc-theme-prop(color, on-surface, false);
+        @include mdc-theme-prop(border-color, background, false);
+      }

-    .ag-cell-range-selected-1 {
-      background-color: rgba(0, 145, 234, 0.3);
-    }
+      .ag-row-selected {
+        border-color: #03a9f4;
+        background-color: transparent;
+        @include stripes-background($mdc-theme-secondary);
+      }

-    .ag-row-hover {
-      background-color: transparent;
-      @include stripes-background($mdc-theme-secondary);
-      border-color: $color-positive;
-    }
+      .ag-cell-range-selected-1 {
+        background-color: rgba(0, 145, 234, 0.3);
+      }

-    .ag-cell.ag-cell-inline-editing {
-      border: 0 !important;
-      border-radius: 0;
-      @include mdc-theme-prop(background-color, surface, false);
-    }
+      .ag-row.ag-row-hover {
+        background-color: transparent;
+        @include stripes-background($mdc-theme-secondary);
+        border-color: $color-positive;
+      }

-    .ag-header-cell::after,
-    .ag-header-group-cell::after {
-      height: 100%;
-      top: 0;
-      @include mdc-theme-prop(background-color, background, false);
-    }
-    .ag-cell.ag-cell-last-left-pinned:not(.ag-cell-range-right):not(.ag-cell-range-single-cell),
-    .ag-pinned-left-header {
-      @include mdc-theme-prop(border-right-color, background, false);
+      .ag-cell.ag-cell-inline-editing {
+        border: 0 !important;
+        border-radius: 0;
+        @include mdc-theme-prop(background-color, surface, false);
+      }
+
+      .ag-header-cell::after,
+      .ag-header-group-cell::after {
+        height: 100%;
+        top: 0;
+        @include mdc-theme-prop(background-color, background, false);
+      }
+
+      .ag-cell.ag-cell-last-left-pinned:not(.ag-cell-range-right):not(.ag-cell-range-single-cell),
+      .ag-pinned-left-header {
+        @include mdc-theme-prop(border-right-color, background, false);
+      }
    }
  }
 }
@@ -9,6 +9,6 @@
@import "@dbeaver/core/assets/styles/theme-dark";
@import "base-ag-grid";

-.theme-dark {
+:global .theme-dark {
  @include base-ag-grid;
 }
@@ -9,6 +9,6 @@
@import '@dbeaver/core/assets/styles/theme-light';
@import "base-ag-grid";

-.theme-light {
+:global .theme-light {
  @include base-ag-grid;
-}
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Serge Rider	d6282bf342	Cloud extension improvements	2020-05-21 16:47:30 +03:00
serge-rider	52f3e98f98	Show user display name (if present)	2020-05-21 10:23:17 +03:00
serge-rider	2ea250fcd4	Non-standard connections support	2020-05-21 01:44:46 +03:00
serge-rider	b39a6bf13d	CB-59 Drivers in CB EE	2020-05-20 23:16:39 +03:00
serge-rider	df3d27a8bf	Include h2 and clickhouse in EE drivers	2020-05-20 22:53:22 +03:00
Serge Rider	8f94243a1f	AWS RDS explorer + authentication	2020-05-20 20:00:45 +03:00
Serge Rider	37b7d2d3cf	Product launch fix. Auth fix	2020-05-20 15:09:04 +03:00
serge-rider	269872badf	Provided credentials read fix	2020-05-20 09:20:38 +03:00
serge-rider	62014b0f95	Provided credentials read fix	2020-05-19 21:33:55 +03:00
serge-rider	c5418a4412	Git ignore	2020-05-19 21:20:30 +03:00
serge-rider	dc847319ab	Authe service manifest fix	2020-05-19 20:55:13 +03:00
Dmitry	7a974df547	Merge pull request #46 from dbeaver/CB-92-builder-package Cb 92 builder package	2020-05-19 19:22:38 +03:00
Dmitry Krupenya	9ea525805f	Merge remote-tracking branch 'origin/devel' into CB-92-builder-package	2020-05-19 19:04:24 +03:00
Dmitry Krupenya	4216451198	chore: fixes after code review	2020-05-19 18:49:59 +03:00
Dmitry Krupenya	9a884733cf	chore: update deploy script	2020-05-19 17:36:06 +03:00
Dmitry Krupenya	ecbc764e79	chore: cleanup webpack config	2020-05-19 14:51:06 +03:00
serge-rider	69be6591b4	Merge remote-tracking branch 'origin/devel' into devel	2020-05-19 13:35:24 +03:00
serge-rider	a93b538f16	Navigator model: node tpye "other"	2020-05-19 13:35:10 +03:00
serge-rider	c85a332d86	Error title fix	2020-05-19 13:34:42 +03:00
Serge Rider	53bf14d56e	Update README.md	2020-05-19 13:06:03 +03:00
serge-rider	3a67a52fb5	1.0.2 release notes	2020-05-19 12:56:51 +03:00
serge-rider	519d058adb	Logging fix	2020-05-19 12:51:15 +03:00
serge-rider	e869cbec92	Navigator nodes search fix	2020-05-19 11:31:42 +03:00
serge-rider	43006772d2	Datasource copy fix (copy folders)	2020-05-19 09:55:29 +03:00
serge-rider	d6edd7fa6f	Cloud authentication model	2020-05-19 01:31:34 +03:00
serge-rider	9c3bf3fe84	Merge remote-tracking branch 'origin/devel' into devel	2020-05-18 23:12:40 +03:00
serge-rider	6577ff53e5	Cloud explorer model.	2020-05-18 23:11:14 +03:00
Dmitry Krupenya	cdc760d811	chore: move bootstrap to core	2020-05-18 20:29:16 +03:00
Dmitry Krupenya	53be09cdcb	chore: fix imports	2020-05-18 20:28:20 +03:00
Dmitry Krupenya	1acf302b29	chore: move public to core	2020-05-18 18:51:08 +03:00
Alexey	0a350a0ad9	Merge pull request #45 from dbeaver/feat-data-export fix(data-export-plugin): add menu item and tooltip	2020-05-18 18:17:27 +03:00
Wroud	7ed099b71b	fix(data-export-plugin): add menu item and tooltip CB-114	2020-05-18 17:23:44 +03:00
Dmitry Krupenya	b77426eb8c	chore: solve issues with sql-editor styles	2020-05-18 17:08:38 +03:00
Dmitry Krupenya	ddcec38a7d	chore: solve issues with ag-grid styles	2020-05-18 17:01:39 +03:00
Dmitry Krupenya	9b5e480f93	chore: custom loader for rollup-postcss-plugin to handle reshadow files	2020-05-18 14:39:20 +03:00
Dmitry Krupenya	3ab3991b35	chore: solve issues with too many Maybe in GQL schema	2020-05-18 13:34:14 +03:00
Dmitry Krupenya	d38927202e	chore: fixes after merge	2020-05-18 13:33:24 +03:00
Dmitry Krupenya	44092c76ea	Merge remote-tracking branch 'origin/devel' into CB-92-builder-package # Conflicts: # webapp/package.json # webapp/packages/builder/configs/webpack/common.js # webapp/packages/builder/src/fix-gql.js # webapp/packages/core/package.json # webapp/packages/core/src/AppBootstrap.ts # webapp/packages/core/src/root/index.ts # webapp/packages/dbeaver/configs/webpack/common-exp.js # webapp/packages/dbeaver/package.json # webapp/yarn.lock	2020-05-18 12:42:46 +03:00
Dmitry Krupenya	e36b05742d	chore: rework postcss reshadow plugin	2020-05-18 12:37:46 +03:00
Dmitry Krupenya	5708127a73	chore: cherrypick from `950580b8`	2020-05-18 10:26:08 +03:00
serge-rider	59793b5cc1	Redundant readme removed	2020-05-17 23:07:09 +03:00
serge-rider	5c14b10e23	MySQL driver resource mapping fix	2020-05-17 21:38:25 +03:00
Alexey	0ec4afe530	Merge pull request #41 from dbeaver/chore-dependencies-cleanup chore: remove prettier and extra dependencies	2020-05-17 15:53:05 +03:00
Alexey	60f87feaf3	Merge pull request #42 from dbeaver/feat-authentication refactor(authentication): reuse Tab block	2020-05-17 15:52:59 +03:00
Alexey	9aec706301	Merge pull request #43 from dbeaver/fix-gql-schema fix(core): gql schema	2020-05-17 15:46:43 +03:00
Alexey	2c5bf8c6b8	Merge pull request #44 from dbeaver/feat-data-export fix: properties table	2020-05-17 15:41:28 +03:00
Wroud	adb9c21be4	fix: properties table CB-113 CB-112	2020-05-17 15:36:39 +03:00
Wroud	04b6b8ec0a	fix(core): gql schema	2020-05-17 15:11:35 +03:00
Wroud	4b4eb2dfd7	refactor(authentication): reuse Tab block refactor(custom-connection-plugin): reuse Tab block	2020-05-17 15:07:21 +03:00
Wroud	102108177f	chore: remove prettier and extra dependencies	2020-05-16 14:54:20 +03:00
Serge Rider	0f0d5882e2	Merge pull request #40 from dbeaver/fix-sdk Fix sdk	2020-05-16 14:07:07 +03:00
Wroud	cbda6a4d25	fix(core): update sdk	2020-05-16 13:29:14 +03:00
Wroud	88841464f9	fix(core): schema Maybe values for array element	2020-05-16 12:46:51 +03:00
Wroud	850f9111ba	fix(core): sdk	2020-05-16 04:02:06 +03:00
Wroud	9c82c3bcc8	fix(authentication): tabs	2020-05-16 04:01:45 +03:00
Wroud	cc17df161d	fix(authentication): provider selection	2020-05-16 01:27:40 +03:00
serge-rider	fde5e1bdca	Change auth providers order	2020-05-16 00:11:31 +03:00
serge-rider	17955f0305	isDefault->defaultProvider rename	2020-05-16 00:06:24 +03:00
serge-rider	7cf05e3508	Revert "chore(core): update sdk" This reverts commit `47ab5dfd`	2020-05-15 23:54:56 +03:00
serge-rider	4bc94e568a	Revert "fix(authentication): providers soting" This reverts commit `355e4886`	2020-05-15 23:54:48 +03:00
Wroud	355e4886f5	fix(authentication): providers soting	2020-05-15 22:20:36 +03:00
Wroud	47ab5dfd7e	chore(core): update sdk	2020-05-15 21:13:28 +03:00
serge-rider	daf9e9aaaa	Default auth provider fix	2020-05-15 20:54:52 +03:00
serge-rider	29e894cad9	CB-122 MySQL driver config fix	2020-05-15 19:45:02 +03:00
Dmitry Krupenya	950289cf68	feat: copy public assets from plugins to final build	2020-05-15 19:01:18 +03:00
Alexey	2a686ed8a3	Merge pull request #39 from dbeaver/feat-authentication Feat authentication	2020-05-15 14:53:27 +03:00
Wroud	efc738d01a	refactor(core): discard MainRightMenu changes	2020-05-15 14:45:17 +03:00
Wroud	24919135cf	refactor(core): connection close behavior	2020-05-15 14:26:39 +03:00
Dmitry Krupenya	e156953e43	Merge remote-tracking branch 'origin/devel' into CB-92-builder-package # Conflicts: # webapp/packages/dbeaver/package.json	2020-05-15 14:08:19 +03:00
Wroud	3f4bd51c33	chore(authentication): readability improvement	2020-05-15 14:03:24 +03:00
Dmitry Krupenya	b309378d7a	feat: change application build - switch all plugins to new build	2020-05-15 13:55:45 +03:00
Wroud	51d823bff4	refactor(core): log viewer behavior	2020-05-15 13:52:52 +03:00
Wroud	4d5cb2eba9	refactor(core): EPermission enum	2020-05-15 13:45:43 +03:00
Wroud	8f14feaf5b	fix(core): dialog styles	2020-05-15 13:41:43 +03:00
Dmitry Krupenya	6374024bd1	feat: change application build - rollup watch for core modules	2020-05-15 12:20:37 +03:00
Dmitry Krupenya	d9ad494856	feat: change application build - builder package	2020-05-15 11:03:30 +03:00
serge-rider	4355e14870	Build script fix	2020-05-15 01:05:08 +03:00
serge-rider	e3a0becad3	Build script fix	2020-05-15 01:00:00 +03:00
serge-rider	98307f69b3	Build script fix	2020-05-15 00:53:55 +03:00
Wroud	3c246c1fc3	chore(core): refactor placeholder	2020-05-14 18:49:19 +03:00
Wroud	13a5e70336	chore: cleanup	2020-05-14 17:08:42 +03:00
Wroud	aced28f537	chore(authentication): minor improvements	2020-05-14 16:23:29 +03:00
Wroud	e4acc7710a	feat(core): add placeholder CB-63	2020-05-14 16:12:29 +03:00
Wroud	b3f3511028	Merge remote-tracking branch 'origin/devel' into feat-authentication	2020-05-14 14:41:20 +03:00
Serge Rider	ea14d8439e	CB deploy scripts fix	2020-05-14 13:39:19 +03:00
Wroud	8aac2ad57a	Merge branch 'devel' into feat-authentication	2020-05-14 00:59:24 +03:00
serge-rider	28ef6ec2a2	Merge remote-tracking branch 'origin/devel' into devel	2020-05-13 21:26:50 +03:00
serge-rider	a5906f820e	#36 Clickhouse driver included. Drivers management redesign.	2020-05-13 21:24:51 +03:00
Alexey	16098feb41	Merge pull request #38 from dbeaver/chore-update-reshadow chore: update reshadow	2020-05-13 19:38:49 +03:00
serge-rider	6f672f925b	gitignore update (Eclipse)	2020-05-13 19:21:49 +03:00
serge-rider	7fe859f97c	JDBC drivers' bundles reconfiguration (db2, exasol, jaybird, derby)	2020-05-13 19:21:32 +03:00
Wroud	950580b8d0	chore: update reshadow	2020-05-13 19:16:34 +03:00
Wroud	5875be2992	chore(core): permission check for logview	2020-05-13 19:00:20 +03:00
Wroud	0039df8a97	feat(core): add usePermission hook	2020-05-13 18:34:44 +03:00
Wroud	a0a554474e	feat(authentication): add user icon	2020-05-13 18:34:24 +03:00
Wroud	3c1baa9dcf	feat(core): persistent dialogs	2020-05-13 18:16:22 +03:00
Wroud	b726a946f7	Merge remote-tracking branch 'origin/devel' into feat-authentication	2020-05-13 17:22:58 +03:00
serge-rider	c93b3304c2	CB-65 Allow anonymous access to session state (permissions, sessionUser, close/touch session)	2020-05-13 17:14:09 +03:00
serge-rider	24ec1ae5d9	CB-120 Session cache reser on login/logout	2020-05-13 16:35:27 +03:00
serge-rider	b22b3af749	JDBC drivers' bundles reconfiguration	2020-05-13 14:33:38 +03:00
serge-rider	863d0e5beb	Driver files: support folders	2020-05-12 23:36:29 +03:00
serge-rider	a702d56154	Config fix	2020-05-12 19:06:56 +03:00
Wroud	72e8ec42d3	Merge remote-tracking branch 'origin/devel' into feat-authentication	2020-05-12 18:10:51 +03:00
serge-rider	78991a1265	Merge remote-tracking branch 'origin/devel' into devel	2020-05-12 18:00:01 +03:00
serge-rider	b794c4a566	Auth permissions read fix	2020-05-12 17:59:21 +03:00
Wroud	70bdf2e440	feat(authentication): add credentials processing	2020-05-12 17:44:24 +03:00
Serge Rider	c88fed91ad	Update README.md	2020-05-12 17:17:47 +03:00
Wroud	f1439c9eca	Merge remote-tracking branch 'origin/devel' into feat-authentication	2020-05-12 17:15:04 +03:00
serge-rider	633d649ac5	Auth API: sessionUser implementation	2020-05-12 15:21:36 +03:00
serge-rider	9d80804cae	Auth API fix. Client hash algorithm simplification	2020-05-11 18:01:09 +03:00
Wroud	74f67ea4dc	Merge remote-tracking branch 'origin/devel' into feat-authentication	2020-05-11 15:36:31 +03:00
Wroud	d0acdc7264	feat(authentication): implementation CB-63	2020-05-11 15:33:13 +03:00
Wroud	1dcfdcf1ee	feat(core): GQLErrorCatcher helper class	2020-05-11 15:31:51 +03:00
serge-rider	0886b40e2c	Feature deps fix	2020-05-11 02:05:54 +03:00
serge-rider	18c195d436	Server run scripts	2020-05-11 01:54:48 +03:00
serge-rider	cd45c04921	CE product feature	2020-05-11 00:53:12 +03:00
serge-rider	9eb28ebb25	Number format preferences initialization fix	2020-05-10 22:48:53 +03:00
Wroud	4938dff230	fix(core): add permission check for nav tree data	2020-05-08 16:13:00 +03:00
Wroud	8370905ccc	feat(authentication): initial CB-63	2020-05-08 14:06:47 +03:00
				`@@ -1 +0,0 @@`
				`MariaDB JDBC driver is distributed under the GNU Lesser General Public License (LGPL). Text of the license can be obtained from http://www.gnu.org/copyleft/lesser.html.`