From 0886b40e2ca0b87ab741a05d8513318dc2b011ab Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Mon, 11 May 2020 02:05:54 +0300
Subject: [PATCH] Feature deps fix

---
 .../src/io/cloudbeaver/server/CBApplication.java           | 6 ++----
 .../features/io.cloudbeaver.product.ce.feature/feature.xml | 4 ++--
 server/product/web-server/CloudbeaverServer.product.launch | 7 +++----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
index 0c4b5a7df9..5dfdd87feb 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/CBApplication.java
@@ -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;
 
diff --git a/server/features/io.cloudbeaver.product.ce.feature/feature.xml b/server/features/io.cloudbeaver.product.ce.feature/feature.xml
index 66fc09c9e9..8b33063068 100644
--- a/server/features/io.cloudbeaver.product.ce.feature/feature.xml
+++ b/server/features/io.cloudbeaver.product.ce.feature/feature.xml
@@ -19,8 +19,8 @@
     </license>
 
     <includes id="io.cloudbeaver.server.feature" version="0.0.0"/>
-    <includes id="io.cloudbeaver.sample.feature"/>
-    <includes id="io.cloudbeaver.ce.drivers.feature"/>
+    <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"/>
 
diff --git a/server/product/web-server/CloudbeaverServer.product.launch b/server/product/web-server/CloudbeaverServer.product.launch
index 1f02b13b71..547df1b452 100644
--- a/server/product/web-server/CloudbeaverServer.product.launch
+++ b/server/product/web-server/CloudbeaverServer.product.launch
@@ -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"/>
@@ -22,11 +21,11 @@
     <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="pde.version" value="3.3"/>
-    <stringAttribute key="product" value="io.cloudbeaver.server.product"/>
+    <stringAttribute key="product" value="io.cloudbeaver.product.ce.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.server.feature:default"/>
+        <setEntry value="io.cloudbeaver.product.ce.feature:default"/>
         <setEntry value="org.jkiss.dbeaver.db.feature:default"/>
         <setEntry value="org.jkiss.dbeaver.runtime.feature:default"/>
     </setAttribute>
@@ -34,7 +33,7 @@
     <stringAttribute key="selected_workspace_plugins" value="com.dbeaver.db.sqlite.crypt@default:default,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.sqlite@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"/>
     <booleanAttribute key="show_selected_only" value="false"/>
     <booleanAttribute key="tracing" value="false"/>
-    <booleanAttribute key="useCustomFeatures" value="false"/>
+    <booleanAttribute key="useCustomFeatures" value="true"/>
     <booleanAttribute key="useDefaultConfig" value="true"/>
     <booleanAttribute key="useDefaultConfigArea" value="true"/>
     <booleanAttribute key="useProduct" value="true"/>