From c5f4fd0e765d764526bdace13d4c4f747053dd45 Mon Sep 17 00:00:00 2001
From: Alexander Fedorov <alexander.fedorov@jkiss.org>
Date: Sat, 11 Nov 2017 14:00:27 +0300
Subject: [PATCH] #2502 move resources to nls: org.jkiss.dbeaver.ext.h2

---
 bundles/org.jkiss.dbeaver.ext.h2.nls/META-INF/MANIFEST.MF   | 1 +
 .../OSGI-INF/l10n/bundle_ru.properties                      | 3 +++
 plugins/org.jkiss.dbeaver.ext.h2/META-INF/MANIFEST.MF       | 5 ++---
 .../OSGI-INF/l10n/bundle.properties                         | 3 +++
 plugins/org.jkiss.dbeaver.ext.h2/build.properties           | 6 +++---
 plugins/org.jkiss.dbeaver.ext.h2/plugin.properties          | 0
 6 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 bundles/org.jkiss.dbeaver.ext.h2.nls/OSGI-INF/l10n/bundle_ru.properties
 create mode 100644 plugins/org.jkiss.dbeaver.ext.h2/OSGI-INF/l10n/bundle.properties
 delete mode 100644 plugins/org.jkiss.dbeaver.ext.h2/plugin.properties

diff --git a/bundles/org.jkiss.dbeaver.ext.h2.nls/META-INF/MANIFEST.MF b/bundles/org.jkiss.dbeaver.ext.h2.nls/META-INF/MANIFEST.MF
index 1dfd9c5896..fa832367ea 100644
--- a/bundles/org.jkiss.dbeaver.ext.h2.nls/META-INF/MANIFEST.MF
+++ b/bundles/org.jkiss.dbeaver.ext.h2.nls/META-INF/MANIFEST.MF
@@ -6,3 +6,4 @@ Bundle-Version: 4.2.4
 Fragment-Host: org.jkiss.dbeaver.ext.h2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
+Bundle-Localization: OSGI-INF/l10n/bundle
diff --git a/bundles/org.jkiss.dbeaver.ext.h2.nls/OSGI-INF/l10n/bundle_ru.properties b/bundles/org.jkiss.dbeaver.ext.h2.nls/OSGI-INF/l10n/bundle_ru.properties
new file mode 100644
index 0000000000..289e44e772
--- /dev/null
+++ b/bundles/org.jkiss.dbeaver.ext.h2.nls/OSGI-INF/l10n/bundle_ru.properties
@@ -0,0 +1,3 @@
+#Properties file for org.jkiss.dbeaver.ext.h2
+Bundle-Vendor = JKISS
+Bundle-Name = DBeaver H2 Support
\ No newline at end of file
diff --git a/plugins/org.jkiss.dbeaver.ext.h2/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.h2/META-INF/MANIFEST.MF
index 69753ed955..041d30bcaa 100644
--- a/plugins/org.jkiss.dbeaver.ext.h2/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.h2/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: H2 Plug-in
+Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.jkiss.dbeaver.ext.h2;singleton:=true
 Bundle-Version: 1.0.23
 Bundle-Release-Date: 20171030
@@ -14,6 +14,5 @@ Require-Bundle: org.eclipse.ui,
  org.jkiss.dbeaver.ext.generic
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-Vendor: JKISS
+Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
-Bundle-Localization: plugin
diff --git a/plugins/org.jkiss.dbeaver.ext.h2/OSGI-INF/l10n/bundle.properties b/plugins/org.jkiss.dbeaver.ext.h2/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000000..289e44e772
--- /dev/null
+++ b/plugins/org.jkiss.dbeaver.ext.h2/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,3 @@
+#Properties file for org.jkiss.dbeaver.ext.h2
+Bundle-Vendor = JKISS
+Bundle-Name = DBeaver H2 Support
\ No newline at end of file
diff --git a/plugins/org.jkiss.dbeaver.ext.h2/build.properties b/plugins/org.jkiss.dbeaver.ext.h2/build.properties
index 7b17480348..6bdfcce373 100644
--- a/plugins/org.jkiss.dbeaver.ext.h2/build.properties
+++ b/plugins/org.jkiss.dbeaver.ext.h2/build.properties
@@ -1,6 +1,6 @@
 source.. = src/
 output.. = bin/
-bin.includes = plugin.xml,\
+bin.includes = .,\
                META-INF/,\
-               .,\
-               plugin.properties
+               OSGI-INF/,\
+               plugin.xml
diff --git a/plugins/org.jkiss.dbeaver.ext.h2/plugin.properties b/plugins/org.jkiss.dbeaver.ext.h2/plugin.properties
deleted file mode 100644
index e69de29bb2..0000000000
-- 
GitLab