Model/UI refactoring

Former-commit-id: 2d04e7a5

features/org.jkiss.dbeaver.ext.generic.feature/feature.xml

@@ -22,6 +22,9 @@
         <import feature="org.jkiss.dbeaver.core.feature" version="1.0.0"/>
     </requires>
 
+    <plugin id="org.jkiss.dbeaver.ext.generic" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <plugin id="org.jkiss.dbeaver.ext.generic.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
     <plugin id="org.jkiss.dbeaver.ext.athena" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.bigquery" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.clickhouse" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
@@ -30,7 +33,6 @@
     <plugin id="org.jkiss.dbeaver.ext.es.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.firebird" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.greenplum" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.generic" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.h2" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.hana" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.hive" download-size="0" install-size="0" version="0.0.0" unpack="false"/>

plugins/org.jkiss.dbeaver.ext.athena/META-INF/MANIFEST.MF

@@ -7,6 +7,7 @@ Bundle-Release-Date: 20190408
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.jkiss.dbeaver.core,
+ org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.ext.generic
 Bundle-Activator: org.jkiss.dbeaver.ext.athena.AthenaActivator
 Bundle-ActivationPolicy: lazy

plugins/org.jkiss.dbeaver.ext.bigquery/META-INF/MANIFEST.MF

@@ -7,6 +7,7 @@ Bundle-Release-Date: 20190408
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.jkiss.dbeaver.core,
+ org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.ext.generic
 Bundle-Activator: org.jkiss.dbeaver.ext.bigquery.BigQueryActivator
 Bundle-ActivationPolicy: lazy

plugins/org.jkiss.dbeaver.ext.clickhouse/META-INF/MANIFEST.MF

@@ -7,7 +7,7 @@ Bundle-Release-Date: 20190408
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.ui.views,
- org.jkiss.dbeaver.core,
+ org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.ext.generic
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

plugins/org.jkiss.dbeaver.ext.db2.zos/META-INF/MANIFEST.MF

@@ -7,7 +7,7 @@ Bundle-Release-Date: 20190408
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.ui.views,
- org.jkiss.dbeaver.core,
+ org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.ext.generic
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

plugins/org.jkiss.dbeaver.ext.derby/META-INF/MANIFEST.MF

@@ -8,6 +8,6 @@ Bundle-Release-Date: 20190408
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime,
- org.jkiss.dbeaver.core,
+ org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.ext.generic
 Bundle-ClassPath: .

plugins/org.jkiss.dbeaver.ext.es.ui/META-INF/MANIFEST.MF

@@ -6,7 +6,7 @@ Bundle-Version: 1.0.17.qualifier
 Bundle-Release-Date: 20190408
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.jkiss.dbeaver.core,
+ org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.ext.generic
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

plugins/org.jkiss.dbeaver.ext.firebird/META-INF/MANIFEST.MF

@@ -11,6 +11,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text,
  org.jkiss.dbeaver.core,
  org.eclipse.ui.workbench.texteditor,
+ org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.ext.generic
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

plugins/org.jkiss.dbeaver.ext.firebird/src/org/jkiss/dbeaver/ext/firebird/model/FireBirdDataTypeCache.java

@@ -34,7 +34,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * SQLiteDataTypeCache
+ * FireBirdDataTypeCache
  */
 public class FireBirdDataTypeCache extends JDBCBasicDataTypeCache<GenericStructContainer, FireBirdDataType>
 {

plugins/org.jkiss.dbeaver.ext.generic.ui/META-INF/MANIFEST.MF

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: DBeaver Generic UI Plug-in
+Bundle-SymbolicName: org.jkiss.dbeaver.ext.generic.ui;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Release-Date: 20190408
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.ui.views,
+ org.eclipse.ui.workbench,
+ org.eclipse.ui.workbench.texteditor,
+ org.jkiss.dbeaver.core,
+ org.jkiss.dbeaver.model,
+ org.jkiss.dbeaver.ext.generic
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-Vendor: JKISS
+Export-Package: org.jkiss.dbeaver.ext.generic.views

plugins/org.jkiss.dbeaver.ext.generic.ui/OSGI-INF/l10n/bundle.properties

+dialog.connection.header = Generic JDBC Connection Settings
+
+editor.source.name = Source
+

plugins/org.jkiss.dbeaver.ext.generic.ui/OSGI-INF/l10n/bundle_de.properties

+#Generated by ResourceBundle Editor (http://essiembre.github.io/eclipse-rbe/)
+
+dialog.connection.header = Allgemeine JDBC Verbindungseinstellungen
+
+editor.source.name = Quelle

plugins/org.jkiss.dbeaver.ext.generic.ui/OSGI-INF/l10n/bundle_es.properties

+# Copyright (C) 2012 Roberto Rossi (impiastro@gmail.com)
+
+dialog.connection.header = Conexin genrica JDBC

plugins/org.jkiss.dbeaver.ext.generic.ui/OSGI-INF/l10n/bundle_fr.properties

+dialog.connection.header = Param\u00E8tres de connexion JDBC g\u00E9n\u00E9riques

plugins/org.jkiss.dbeaver.ext.generic.ui/OSGI-INF/l10n/bundle_it.properties

+# Copyright (C) 2012 Roberto Rossi (impiastro@gmail.com)
+
+dialog.connection.header = Impostazioni Connessione Generica JDBC

plugins/org.jkiss.dbeaver.ext.generic.ui/OSGI-INF/l10n/bundle_ja.properties

+
+dialog.connection.header=\u4E00\u822C\u7684\u306AJDBC\u63A5\u7D9A\u8A2D\u5B9A
+
+editor.source.name=\u30BD\u30FC\u30B9

plugins/org.jkiss.dbeaver.ext.generic.ui/OSGI-INF/l10n/bundle_ru.properties

+
+dialog.connection.header=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u0431\u0430\u0437\u043E\u0432\u043E\u0433\u043E \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u044F

plugins/org.jkiss.dbeaver.ext.generic.ui/OSGI-INF/l10n/bundle_zh.properties

+dialog.connection.header = \u901A\u7528 JDBC \u8FDE\u63A5\u8BBE\u7F6E
+
+editor.source.name = \u8D44\u6E90

plugins/org.jkiss.dbeaver.ext.generic.ui/build.properties

+source.. = src/
+output.. = target/classes/
+bin.includes = .,\
+               META-INF/,\
+               OSGI-INF/,\
+               plugin.xml

plugins/org.jkiss.dbeaver.ext.generic.ui/plugin.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+
+<plugin>
+
+    <extension point="org.jkiss.dbeaver.dataSourceView">
+        <view
+                id="org.jkiss.dbeaver.ext.generic.dataSourceWizardView"
+                dataSource="generic"
+                targetID="org.jkiss.dbeaver.ext.ui.newConnectionWizard"
+                label="%dialog.connection.header"
+                class="org.jkiss.dbeaver.ext.generic.views.GenericConnectionPage"
+                icon="#database_icon_default">
+        </view>
+        <view
+                class="org.jkiss.dbeaver.ext.generic.views.GenericConnectionPage"
+                icon="#database_icon_default"
+                id="org.jkiss.dbeaver.ext.generic.dataSourceEditorView"
+                dataSource="generic"
+                label="%dialog.connection.header"
+                targetID="org.jkiss.dbeaver.ext.ui.editConnectionDialog">
+        </view>
+    </extension>
+
+    <extension point="org.jkiss.dbeaver.databaseEditor">
+        <editor
+                id="generic.table.ddl.view"
+                class="org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer"
+                main="false"
+                label="DDL"
+                description="%tree.ddl.node.tip"
+                position="additions_end"
+                icon="#sql_text"
+                type="folder">
+            <objectType name="org.jkiss.dbeaver.ext.generic.model.GenericTable" if="!object.view"/>
+        </editor>
+        <editor
+                id="generic.view.source.view"
+                class="org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer"
+                main="false"
+                label="Definition"
+                description="View definition"
+                position="additions_end"
+                icon="#sql_text"
+                type="folder"
+                embeddable="false">
+            <objectType name="org.jkiss.dbeaver.ext.generic.model.GenericTable" if="object.view"/>
+        </editor>
+        <editor id="generic.source.view" class="org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer"
+                label="%editor.source.name" description="%editor.source.name" icon="#sql_text" position="additions_middle"
+                contributor="org.jkiss.dbeaver.ui.editors.sql.SQLEditorContributorNested" type="folder" embeddable="false">
+            <objectType name="org.jkiss.dbeaver.ext.generic.model.GenericScriptObject"/>
+        </editor>
+    </extension>
+
+</plugin>

plugins/org.jkiss.dbeaver.ext.generic.ui/pom.xml

+<?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>org.jkiss.dbeaver</groupId>
+    <artifactId>plugins</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+     <relativePath>../</relativePath>
+  </parent>
+  <artifactId>org.jkiss.dbeaver.ext.generic.ui</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>

plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/GenericMessages.java → plugins/org.jkiss.dbeaver.ext.generic.ui/src/org/jkiss/dbeaver/ext/generic/internal/GenericMessages.java

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.jkiss.dbeaver.ext.generic;
+package org.jkiss.dbeaver.ext.generic.internal;
 
 import org.eclipse.osgi.util.NLS;
 
 public class GenericMessages extends NLS {
-    static final String BUNDLE_NAME = "org.jkiss.dbeaver.ext.generic.GenericResources"; //$NON-NLS-1$
+    static final String BUNDLE_NAME = "org.jkiss.dbeaver.ext.generic.internal.GenericResources"; //$NON-NLS-1$
     public static String dialog_connection_advanced_tab;
 
     public static String dialog_connection_advanced_tab_tooltip;

plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/GenericResources.properties → plugins/org.jkiss.dbeaver.ext.generic.ui/src/org/jkiss/dbeaver/ext/generic/internal/GenericResources.properties

-
-dialog_connection_advanced_tab=Advanced
-dialog_connection_advanced_tab_tooltip=Advanced/custom driver properties
-dialog_connection_browse_button=Browse ... 
-dialog_connection_database_schema_label=Database/Schema:
-dialog_connection_db_file_chooser_text=Choose database file
-dialog_connection_db_folder_chooser_message=Choose folder with database files
-dialog_connection_db_folder_chooser_text=Choose database folder
-dialog_connection_general_tab=General
-dialog_connection_general_tab_tooltip=General connection properties
-dialog_connection_host_label=Host:
-dialog_connection_jdbc_url_=JDBC URL:
-dialog_connection_password_label=Password:
-dialog_connection_path_label=Path:
-dialog_connection_port_label=Port:
-dialog_connection_server_label=Server:
-dialog_connection_test_connection_button=Test Connection ... 
-dialog_connection_user_name_label=User name:
+
+dialog_connection_advanced_tab=Advanced
+dialog_connection_advanced_tab_tooltip=Advanced/custom driver properties
+dialog_connection_browse_button=Browse ... 
+dialog_connection_database_schema_label=Database/Schema:
+dialog_connection_db_file_chooser_text=Choose database file
+dialog_connection_db_folder_chooser_message=Choose folder with database files
+dialog_connection_db_folder_chooser_text=Choose database folder
+dialog_connection_general_tab=General
+dialog_connection_general_tab_tooltip=General connection properties
+dialog_connection_host_label=Host:
+dialog_connection_jdbc_url_=JDBC URL:
+dialog_connection_password_label=Password:
+dialog_connection_path_label=Path:
+dialog_connection_port_label=Port:
+dialog_connection_server_label=Server:
+dialog_connection_test_connection_button=Test Connection ... 
+dialog_connection_user_name_label=User name:

plugins/org.jkiss.dbeaver.ext.generic/META-INF/MANIFEST.MF

 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DBeaver Generic Plug-in
-Bundle-SymbolicName: org.jkiss.dbeaver.ext.generic; singleton:=true
+Bundle-SymbolicName: org.jkiss.dbeaver.ext.generic;singleton:=true
 Bundle-Version: 2.3.92.qualifier
 Bundle-Release-Date: 20190408
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.jkiss.dbeaver.core,
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.ui,
  org.eclipse.jface.text,
  org.eclipse.ui.views,
  org.eclipse.ui.workbench,
- org.eclipse.ui.workbench.texteditor,
- org.apache.commons.logging
+ org.jkiss.dbeaver.model,
+ org.jkiss.dbeaver.ui,
+ org.jkiss.dbeaver.ui.editors.base
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: JKISS
 Export-Package: org.jkiss.dbeaver.ext.generic,
  org.jkiss.dbeaver.ext.generic.edit,
  org.jkiss.dbeaver.ext.generic.model,
- org.jkiss.dbeaver.ext.generic.model.meta,
- org.jkiss.dbeaver.ext.generic.views
+ org.jkiss.dbeaver.ext.generic.model.meta

plugins/org.jkiss.dbeaver.ext.generic/plugin.xml

@@ -20,7 +20,6 @@
 <plugin>
     <extension-point id="org.jkiss.dbeaver.generic.meta" name="Generic meta model retrieval" schema="schema/org.jkiss.dbeaver.generic.meta.exsd"/>
 
-
     <extension point="org.jkiss.dbeaver.dataSourceProvider">
         <datasource
             class="org.jkiss.dbeaver.ext.generic.GenericDataSourceProvider"
@@ -1280,25 +1279,6 @@
         </datasource>
     </extension>
 
-    <extension point="org.jkiss.dbeaver.dataSourceView">
-        <view
-                id="org.jkiss.dbeaver.ext.generic.dataSourceWizardView"
-                dataSource="generic"
-                targetID="org.jkiss.dbeaver.ext.ui.newConnectionWizard"
-                label="%dialog.connection.header"
-                class="org.jkiss.dbeaver.ext.generic.views.GenericConnectionPage"
-                icon="#database_icon_default">
-        </view>
-        <view
-                class="org.jkiss.dbeaver.ext.generic.views.GenericConnectionPage"
-                icon="#database_icon_default"
-                id="org.jkiss.dbeaver.ext.generic.dataSourceEditorView"
-                dataSource="generic"
-                label="%dialog.connection.header"
-                targetID="org.jkiss.dbeaver.ext.ui.editConnectionDialog">
-        </view>
-    </extension>
-
     <extension point="org.jkiss.dbeaver.dataTypeProvider">
         <provider
                 class="org.jkiss.dbeaver.ext.generic.data.GenericValueHandlerProvider"
@@ -1319,37 +1299,6 @@
         <manager class="org.jkiss.dbeaver.ext.generic.edit.GenericProcedureManager"     objectType="org.jkiss.dbeaver.ext.generic.model.GenericProcedure"/>
     </extension>
 
-    <extension point="org.jkiss.dbeaver.databaseEditor">
-        <editor
-                id="generic.table.ddl.view"
-                class="org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer"
-                main="false"
-                label="DDL"
-                description="%tree.ddl.node.tip"
-                position="additions_end"
-                icon="#sql_text"
-                type="folder">
-            <objectType name="org.jkiss.dbeaver.ext.generic.model.GenericTable" if="!object.view"/>
-        </editor>
-        <editor
-                id="generic.view.source.view"
-                class="org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer"
-                main="false"
-                label="Definition"
-                description="View definition"
-                position="additions_end"
-                icon="#sql_text"
-                type="folder"
-                embeddable="false">
-            <objectType name="org.jkiss.dbeaver.ext.generic.model.GenericTable" if="object.view"/>
-        </editor>
-        <editor id="generic.source.view" class="org.jkiss.dbeaver.ui.editors.sql.SQLSourceViewer"
-                label="%editor.source.name" description="%editor.source.name" icon="#sql_text" position="additions_middle"
-                contributor="org.jkiss.dbeaver.ui.editors.sql.SQLEditorContributorNested" type="folder" embeddable="false">
-            <objectType name="org.jkiss.dbeaver.ext.generic.model.GenericScriptObject"/>
-        </editor>
-    </extension>
-
     <extension point="org.jkiss.dbeaver.generic.meta">
         <meta id="indexed" class="org.jkiss.dbeaver.ext.generic.model.meta.GenericMetaModel">
             <object type="catalog">

plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/meta/GenericMetaColumn.java

@@ -17,7 +17,6 @@
 package org.jkiss.dbeaver.ext.generic.model.meta;
 
 import org.eclipse.core.runtime.IConfigurationElement;
-import org.jkiss.dbeaver.registry.RegistryConstants;
 import org.jkiss.utils.CommonUtils;
 
 /**
@@ -32,8 +31,8 @@ public class GenericMetaColumn {
 
     public GenericMetaColumn(IConfigurationElement cfg)
     {
-        this.id = cfg.getAttribute(RegistryConstants.ATTR_ID);
-        this.columnName = cfg.getAttribute(RegistryConstants.ATTR_NAME);
+        this.id = cfg.getAttribute("id");
+        this.columnName = cfg.getAttribute("name");
         String indexStr = cfg.getAttribute("index");
         if (!CommonUtils.isEmpty(indexStr)) {
             this.columnIndex = Integer.valueOf(indexStr);

plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/meta/GenericMetaModelDescriptor.java

@@ -19,10 +19,7 @@ package org.jkiss.dbeaver.ext.generic.model.meta;
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.ext.generic.model.meta.GenericMetaModel;
-import org.jkiss.dbeaver.ext.generic.model.meta.GenericMetaObject;
 import org.jkiss.dbeaver.model.impl.AbstractDescriptor;
-import org.jkiss.dbeaver.registry.RegistryConstants;
 import org.jkiss.utils.ArrayUtils;
 import org.jkiss.utils.CommonUtils;
 
@@ -50,7 +47,7 @@ public class GenericMetaModelDescriptor extends AbstractDescriptor {
         super(cfg);
         this.contributorConfig = cfg;
 
-        this.id = cfg.getAttribute(RegistryConstants.ATTR_ID);
+        this.id = cfg.getAttribute("id");
         IConfigurationElement[] objectList = cfg.getChildren("object");
         if (!ArrayUtils.isEmpty(objectList)) {
             for (IConfigurationElement childConfig : objectList) {

plugins/org.jkiss.dbeaver.ext.generic/src/org/jkiss/dbeaver/ext/generic/model/meta/GenericMetaObject.java

@@ -17,7 +17,6 @@
 package org.jkiss.dbeaver.ext.generic.model.meta;
 
 import org.eclipse.core.runtime.IConfigurationElement;
-import org.jkiss.dbeaver.registry.RegistryConstants;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -33,7 +32,7 @@ public class GenericMetaObject {
 
     public GenericMetaObject(IConfigurationElement cfg)
     {
-        this.type = cfg.getAttribute(RegistryConstants.ATTR_TYPE);
+        this.type = cfg.getAttribute("type");
         this.readQuery = cfg.getAttribute("read-query");
         for (IConfigurationElement columnCfg : cfg.getChildren("column")) {
             GenericMetaColumn column = new GenericMetaColumn(columnCfg);

plugins/org.jkiss.dbeaver.ext.h2/META-INF/MANIFEST.MF

@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.views,
  org.eclipse.jface,
  org.eclipse.jface.text,
- org.jkiss.dbeaver.core,
+ org.jkiss.dbeaver.model,
  org.eclipse.ui.workbench.texteditor,
  org.jkiss.dbeaver.ext.generic
 Bundle-ActivationPolicy: lazy

plugins/org.jkiss.dbeaver.ext.vertica/META-INF/MANIFEST.MF

@@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text,
  org.jkiss.dbeaver.core,
  org.eclipse.ui.workbench.texteditor,
- org.jkiss.dbeaver.ext.generic
+ org.jkiss.dbeaver.ext.generic,
+ org.jkiss.dbeaver.ext.generic.ui
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor

plugins/pom.xml

@@ -35,6 +35,9 @@
         <module>org.jkiss.dbeaver.core.application</module>
         <module>org.jkiss.dbeaver.core.eclipse</module>
 
+        <module>org.jkiss.dbeaver.ext.generic</module>
+        <module>org.jkiss.dbeaver.ext.generic.ui</module>
+
         <module>org.jkiss.dbeaver.ext.athena</module>
         <module>org.jkiss.dbeaver.ext.bigquery</module>
         <module>org.jkiss.dbeaver.ext.clickhouse</module>
@@ -44,7 +47,6 @@
         <module>org.jkiss.dbeaver.ext.erd</module>
         <module>org.jkiss.dbeaver.ext.es.ui</module>
         <module>org.jkiss.dbeaver.ext.firebird</module>
-        <module>org.jkiss.dbeaver.ext.generic</module>
         <module>org.jkiss.dbeaver.ext.greenplum</module>
         <module>org.jkiss.dbeaver.ext.import_config</module>
         <module>org.jkiss.dbeaver.ext.format.sqlworkbenchj</module>