From bbd4ee854b63ee45b69b9cbd0f6c0f225ae447b9 Mon Sep 17 00:00:00 2001 From: Anastasiya Volkova Date: Fri, 24 Apr 2020 17:29:06 +0300 Subject: [PATCH] #8517 ui part of plugin ext.spanner in ext.spanner.ui moved --- .../org.jkiss.dbeaver.db.feature/feature.xml | 1 + .../feature.xml | 2 +- .../META-INF/MANIFEST.MF | 17 ++++++++++++ .../OSGI-INF/l10n/bundle.properties | 4 +++ .../OSGI-INF/l10n/bundle_de.properties | 1 + .../OSGI-INF/l10n/bundle_pt_BR.properties | 4 +++ .../OSGI-INF/l10n/bundle_ru.properties | 1 + .../build.properties | 7 +++++ .../icons/spanner_logo.png | Bin 0 -> 9023 bytes .../plugin.xml | 25 ++++++++++++++++++ .../org.jkiss.dbeaver.ext.spanner.ui/pom.xml | 14 ++++++++++ .../ext/spanner/ui}/SpannerActivator.java | 4 +-- .../spanner/ui/internal}/SpannerMessages.java | 6 +++-- .../spanner/ui/internal}/messages.properties | 2 ++ .../ui/internal/messages_de.properties | 5 ++++ .../ui/internal}/messages_ru.properties | 2 ++ .../ui}/views/SpannerConnectionPage.java | 9 ++++--- .../META-INF/MANIFEST.MF | 8 ++---- .../OSGI-INF/l10n/bundle.properties | 4 +-- .../OSGI-INF/l10n/bundle_pt_BR.properties | 4 +-- .../OSGI-INF/l10n/bundle_ru.properties | 2 +- .../org.jkiss.dbeaver.ext.spanner/plugin.xml | 19 +------------ plugins/pom.xml | 3 ++- 23 files changed, 103 insertions(+), 41 deletions(-) create mode 100644 plugins/org.jkiss.dbeaver.ext.spanner.ui/META-INF/MANIFEST.MF create mode 100644 plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle.properties create mode 100644 plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_de.properties create mode 100644 plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_pt_BR.properties create mode 100644 plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_ru.properties create mode 100644 plugins/org.jkiss.dbeaver.ext.spanner.ui/build.properties create mode 100644 plugins/org.jkiss.dbeaver.ext.spanner.ui/icons/spanner_logo.png create mode 100644 plugins/org.jkiss.dbeaver.ext.spanner.ui/plugin.xml create mode 100644 plugins/org.jkiss.dbeaver.ext.spanner.ui/pom.xml rename plugins/{org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner => org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui}/SpannerActivator.java (96%) rename plugins/{org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views => org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal}/SpannerMessages.java (70%) rename plugins/{org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views => org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal}/messages.properties (68%) create mode 100644 plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/messages_de.properties rename plugins/{org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views => org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal}/messages_ru.properties (66%) rename plugins/{org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner => org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui}/views/SpannerConnectionPage.java (93%) diff --git a/features/org.jkiss.dbeaver.db.feature/feature.xml b/features/org.jkiss.dbeaver.db.feature/feature.xml index a49c7aa50f..c1858dd52a 100644 --- a/features/org.jkiss.dbeaver.db.feature/feature.xml +++ b/features/org.jkiss.dbeaver.db.feature/feature.xml @@ -44,6 +44,7 @@ + diff --git a/features/org.jkiss.dbeaver.db.ui.feature/feature.xml b/features/org.jkiss.dbeaver.db.ui.feature/feature.xml index fea7544e46..2a8b57a178 100644 --- a/features/org.jkiss.dbeaver.db.ui.feature/feature.xml +++ b/features/org.jkiss.dbeaver.db.ui.feature/feature.xml @@ -30,7 +30,7 @@ - + diff --git a/plugins/org.jkiss.dbeaver.ext.spanner.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.spanner.ui/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..7a4a12fdbf --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.spanner.ui/META-INF/MANIFEST.MF @@ -0,0 +1,17 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name +Bundle-SymbolicName: org.jkiss.dbeaver.ext.spanner.ui;singleton:=true +Bundle-Version: 1.0.1.qualifier +Bundle-Release-Date: 20200420 +Bundle-Activator: org.jkiss.dbeaver.ext.spanner.ui.SpannerActivator +Require-Bundle: org.eclipse.ui, + org.jkiss.dbeaver.ui.editors.connection, + org.jkiss.dbeaver.model, + org.jkiss.dbeaver.ui, + org.jkiss.dbeaver.ext.spanner +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-Vendor: %Bundle-Vendor +Bundle-Localization: OSGI-INF/l10n/bundle +Automatic-Module-Name: org.jkiss.dbeaver.ext.athena.ui diff --git a/plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle.properties new file mode 100644 index 0000000000..b4eeb901be --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle.properties @@ -0,0 +1,4 @@ +Bundle-Vendor = DBeaver Corp +Bundle-Name = DBeaver Google Spanner UI + +spanner.dialog.connection.header=Google Spanner Connection Settings \ No newline at end of file diff --git a/plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_de.properties b/plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_de.properties new file mode 100644 index 0000000000..cea1cfb4ef --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_de.properties @@ -0,0 +1 @@ +spanner.dialog.connection.header=Google Spanner Verbindungseinstellungen \ No newline at end of file diff --git a/plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_pt_BR.properties b/plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_pt_BR.properties new file mode 100644 index 0000000000..d8f77aacee --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_pt_BR.properties @@ -0,0 +1,4 @@ +Bundle-Name = DBeaver Google UI +Bundle-Vendor = DBeaver Corp + +spanner.dialog.connection.header = Google Spanner Configura\u00E7\u00F5es de conex\u00E3o diff --git a/plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_ru.properties b/plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_ru.properties new file mode 100644 index 0000000000..bf48b76afd --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.spanner.ui/OSGI-INF/l10n/bundle_ru.properties @@ -0,0 +1 @@ +spanner.dialog.connection.header=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F Google Spanner diff --git a/plugins/org.jkiss.dbeaver.ext.spanner.ui/build.properties b/plugins/org.jkiss.dbeaver.ext.spanner.ui/build.properties new file mode 100644 index 0000000000..cda86e8959 --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.spanner.ui/build.properties @@ -0,0 +1,7 @@ +source.. = src/ +output.. = target/classes/ +bin.includes = plugin.xml,\ + META-INF/,\ + .,\ + OSGI-INF/,\ + icons/,\ diff --git a/plugins/org.jkiss.dbeaver.ext.spanner.ui/icons/spanner_logo.png b/plugins/org.jkiss.dbeaver.ext.spanner.ui/icons/spanner_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..de61f6bda95846d3d4bcc849a8e135b4d3dc800e GIT binary patch literal 9023 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 + + + + + + + + + + + + diff --git a/plugins/org.jkiss.dbeaver.ext.spanner.ui/pom.xml b/plugins/org.jkiss.dbeaver.ext.spanner.ui/pom.xml new file mode 100644 index 0000000000..9236737b5f --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.spanner.ui/pom.xml @@ -0,0 +1,14 @@ + + + 4.0.0 + + org.jkiss.dbeaver + plugins + 1.0.0-SNAPSHOT + ../ + + org.jkiss.dbeaver.ext.spanner.ui + 1.0.1-SNAPSHOT + eclipse-plugin + diff --git a/plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/SpannerActivator.java b/plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/SpannerActivator.java similarity index 96% rename from plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/SpannerActivator.java rename to plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/SpannerActivator.java index 50643791ca..ca95de72d6 100644 --- a/plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/SpannerActivator.java +++ b/plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/SpannerActivator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jkiss.dbeaver.ext.spanner; +package org.jkiss.dbeaver.ext.spanner.ui; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -26,7 +26,7 @@ import org.osgi.framework.BundleContext; public class SpannerActivator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.jkiss.dbeaver.ext.spanner"; + public static final String PLUGIN_ID = "org.jkiss.dbeaver.ext.spanner.ui"; // The shared instance private static SpannerActivator plugin; diff --git a/plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/SpannerMessages.java b/plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/SpannerMessages.java similarity index 70% rename from plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/SpannerMessages.java rename to plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/SpannerMessages.java index dadedd8cd5..1921601167 100644 --- a/plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/SpannerMessages.java +++ b/plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/SpannerMessages.java @@ -1,13 +1,15 @@ -package org.jkiss.dbeaver.ext.spanner.views; +package org.jkiss.dbeaver.ext.spanner.ui.internal; import org.eclipse.osgi.util.NLS; public class SpannerMessages extends NLS { - private static final String BUNDLE_NAME = "org.jkiss.dbeaver.ext.spanner.views.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.jkiss.dbeaver.ext.spanner.ui.internal.messages"; //$NON-NLS-1$ public static String label_connection; public static String label_private_key_path; public static String label_project; + public static String label_instance; + public static String label_database; static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, SpannerMessages.class); diff --git a/plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/messages.properties b/plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/messages.properties similarity index 68% rename from plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/messages.properties rename to plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/messages.properties index c8227d0a50..1534972113 100644 --- a/plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/messages.properties +++ b/plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/messages.properties @@ -1,3 +1,5 @@ label_connection=Connection label_private_key_path=Private key path (p12 or JSON) label_project=Project +label_instance=Instance +label_database=Database \ No newline at end of file diff --git a/plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/messages_de.properties b/plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/messages_de.properties new file mode 100644 index 0000000000..179fc58af4 --- /dev/null +++ b/plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/messages_de.properties @@ -0,0 +1,5 @@ +label_connection=Verbindung +label_private_key_path=Privater Schl\u00fcsselpfad (p12 oder JSON) +label_project=Projekt +label_instance=Instanz +label_database=Datenbank \ No newline at end of file diff --git a/plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/messages_ru.properties b/plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/messages_ru.properties similarity index 66% rename from plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/messages_ru.properties rename to plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/messages_ru.properties index cbbdf91025..52a999e4ea 100644 --- a/plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/messages_ru.properties +++ b/plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/internal/messages_ru.properties @@ -1,3 +1,5 @@ label_connection=\u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435 label_private_key_path=\u041F\u0443\u0442\u044C \u043A \u0437\u0430\u043A\u0440\u044B\u0442\u043E\u043C\u0443 \u043A\u043B\u044E\u0447\u0443 (p12 \u0438\u043B\u0438 JSON) label_project=\u041F\u0440\u043E\u0435\u043A\u0442 +label_instance=\u042d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440 +label_database=\u0411\u0430\u0437\u0430\u0020\u0434\u0430\u043d\u043d\u044b\u0445 \ No newline at end of file diff --git a/plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/SpannerConnectionPage.java b/plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/views/SpannerConnectionPage.java similarity index 93% rename from plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/SpannerConnectionPage.java rename to plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/views/SpannerConnectionPage.java index f6298645b1..decd4f2a05 100644 --- a/plugins/org.jkiss.dbeaver.ext.spanner/src/org/jkiss/dbeaver/ext/spanner/views/SpannerConnectionPage.java +++ b/plugins/org.jkiss.dbeaver.ext.spanner.ui/src/org/jkiss/dbeaver/ext/spanner/ui/views/SpannerConnectionPage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jkiss.dbeaver.ext.spanner.views; +package org.jkiss.dbeaver.ext.spanner.ui.views; import org.eclipse.jface.dialogs.IDialogPage; import org.eclipse.jface.resource.ImageDescriptor; @@ -25,7 +25,8 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Text; import org.jkiss.dbeaver.Log; -import org.jkiss.dbeaver.ext.spanner.SpannerActivator; +import org.jkiss.dbeaver.ext.spanner.ui.SpannerActivator; +import org.jkiss.dbeaver.ext.spanner.ui.internal.SpannerMessages; import org.jkiss.dbeaver.ext.spanner.model.SpannerConstants; import org.jkiss.dbeaver.model.DBPDataSourceContainer; import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration; @@ -78,11 +79,11 @@ public class SpannerConnectionPage extends ConnectionPageAbstract implements ICo projectText = UIUtils.createLabelText(addrGroup, SpannerMessages.label_project, ""); //$NON-NLS-2$ projectText.addModifyListener(textListener); - instanceText = UIUtils.createLabelText(addrGroup, "Instance", ""); //$NON-NLS-2$ + instanceText = UIUtils.createLabelText(addrGroup, SpannerMessages.label_instance, ""); //$NON-NLS-2$ instanceText.setToolTipText("Spanner Instance ID"); //$NON-NLS-1$ instanceText.addModifyListener(textListener); - databaseText = UIUtils.createLabelText(addrGroup, "Database", ""); //$NON-NLS-2$ + databaseText = UIUtils.createLabelText(addrGroup, SpannerMessages.label_database, ""); //$NON-NLS-2$ databaseText.setToolTipText("Spanner Database ID"); //$NON-NLS-1$ databaseText.addModifyListener(textListener); diff --git a/plugins/org.jkiss.dbeaver.ext.spanner/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.spanner/META-INF/MANIFEST.MF index 0ca0dbf070..cde5d815df 100644 --- a/plugins/org.jkiss.dbeaver.ext.spanner/META-INF/MANIFEST.MF +++ b/plugins/org.jkiss.dbeaver.ext.spanner/META-INF/MANIFEST.MF @@ -4,14 +4,10 @@ Bundle-Name: DBeaver Spanner extension Bundle-SymbolicName: org.jkiss.dbeaver.ext.spanner;singleton:=true Bundle-Version: 1.0.18.qualifier Bundle-Release-Date: 20200420 -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.spanner.SpannerActivator +Require-Bundle: org.jkiss.dbeaver.ext.generic Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: DBeaver Corp Bundle-Localization: OSGI-INF/l10n/bundle Automatic-Module-Name: org.jkiss.dbeaver.ext.spanner +Export-Package: org.jkiss.dbeaver.ext.spanner.model diff --git a/plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle.properties index 94acfabfc1..a4637e5dad 100644 --- a/plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle.properties +++ b/plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle.properties @@ -1,5 +1,3 @@ Bundle-Vendor = DBeaver Corp Bundle-Name = DBeaver Google Spanner Extension -datasource.spanner.description = Spanner datasource - -spanner.dialog.connection.header=Google Spanner Connection Settings +datasource.spanner.description = Spanner datasource \ No newline at end of file diff --git a/plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle_pt_BR.properties b/plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle_pt_BR.properties index 225ef21313..17ddc9a010 100644 --- a/plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle_pt_BR.properties +++ b/plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle_pt_BR.properties @@ -3,6 +3,4 @@ Bundle-Name = DBeaver Google Spanner Extens\u00E3o Bundle-Vendor = DBeaver Corp -datasource.spanner.description = Spanner fonte de dados - -spanner.dialog.connection.header = Google Spanner Configura\u00E7\u00F5es de conex\u00E3o +datasource.spanner.description = Spanner fonte de dados \ No newline at end of file diff --git a/plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle_ru.properties b/plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle_ru.properties index bf48b76afd..a4335db05f 100644 --- a/plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle_ru.properties +++ b/plugins/org.jkiss.dbeaver.ext.spanner/OSGI-INF/l10n/bundle_ru.properties @@ -1 +1 @@ -spanner.dialog.connection.header=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u044F Google Spanner +datasource.spanner.description = Spanner \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0020\u0434\u0430\u043d\u043d\u044b\u0445 \ No newline at end of file diff --git a/plugins/org.jkiss.dbeaver.ext.spanner/plugin.xml b/plugins/org.jkiss.dbeaver.ext.spanner/plugin.xml index 089413cec5..b0f1c8c2c1 100644 --- a/plugins/org.jkiss.dbeaver.ext.spanner/plugin.xml +++ b/plugins/org.jkiss.dbeaver.ext.spanner/plugin.xml @@ -44,23 +44,6 @@ - - - - - - + diff --git a/plugins/pom.xml b/plugins/pom.xml index 85e4e07eb2..99ded50f2d 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -47,6 +47,7 @@ org.jkiss.dbeaver.ext.postgresql org.jkiss.dbeaver.ext.snowflake.core + org.jkiss.dbeaver.ext.spanner org.jkiss.dbeaver.ext.sqlite org.jkiss.dbeaver.ext.vertica org.jkiss.dbeaver.ext.teradata @@ -88,7 +89,7 @@ org.jkiss.dbeaver.ext.postgresql.debug.core org.jkiss.dbeaver.ext.postgresql.debug.ui org.jkiss.dbeaver.ext.sqlite.ui - org.jkiss.dbeaver.ext.spanner + org.jkiss.dbeaver.ext.spanner.ui org.jkiss.dbeaver.ext.snowflake.ui org.jkiss.dbeaver.ext.vertica.ui org.jkiss.dbeaver.ext.wmi -- GitLab