From 1510aa27fbdd23ebb9299e8c4893dfe6c45e71ed Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Wed, 4 Sep 2019 01:30:38 +0300
Subject: [PATCH] AppxConverter

---
 .../build.properties                          |  1 +
 .../pom.xml                                   | 35 +++++++++++++++++++
 .../root/.eclipseproduct                      |  3 ++
 .../root/readme.txt                           | 18 ++++++++++
 features/org.jkiss.dbeaver.ce.feature/pom.xml | 24 -------------
 product/appstore/product-branding.properties  |  2 +-
 6 files changed, 58 insertions(+), 25 deletions(-)
 create mode 100644 features/org.jkiss.dbeaver.appstore.feature/root/.eclipseproduct
 create mode 100644 features/org.jkiss.dbeaver.appstore.feature/root/readme.txt

diff --git a/features/org.jkiss.dbeaver.appstore.feature/build.properties b/features/org.jkiss.dbeaver.appstore.feature/build.properties
index b3a611b5c930..bef6ea6a9e62 100644
--- a/features/org.jkiss.dbeaver.appstore.feature/build.properties
+++ b/features/org.jkiss.dbeaver.appstore.feature/build.properties
@@ -1,2 +1,3 @@
 bin.includes = feature.xml,\
                feature.properties
+root = ../../docs/root,target/generated
diff --git a/features/org.jkiss.dbeaver.appstore.feature/pom.xml b/features/org.jkiss.dbeaver.appstore.feature/pom.xml
index 6962f14784bd..440439f33a59 100644
--- a/features/org.jkiss.dbeaver.appstore.feature/pom.xml
+++ b/features/org.jkiss.dbeaver.appstore.feature/pom.xml
@@ -13,4 +13,39 @@
     <version>6.2.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>
diff --git a/features/org.jkiss.dbeaver.appstore.feature/root/.eclipseproduct b/features/org.jkiss.dbeaver.appstore.feature/root/.eclipseproduct
new file mode 100644
index 000000000000..60633fc50698
--- /dev/null
+++ b/features/org.jkiss.dbeaver.appstore.feature/root/.eclipseproduct
@@ -0,0 +1,3 @@
+name=${dbeaver-product}
+id=org.jkiss.dbeaver.product
+version=${dbeaver-version}
diff --git a/features/org.jkiss.dbeaver.appstore.feature/root/readme.txt b/features/org.jkiss.dbeaver.appstore.feature/root/readme.txt
new file mode 100644
index 000000000000..7d9a445e6cce
--- /dev/null
+++ b/features/org.jkiss.dbeaver.appstore.feature/root/readme.txt
@@ -0,0 +1,18 @@
+${dbeaver-product}
+
+${dbeaver-version}
+
+README
+
+Licensing
+==========================
+  Apache License 2 (http://www.apache.org/licenses/LICENSE-2.0)
+
+Web
+==========
+  Main web site: https://dbeaver.io
+  Source code: https://github.com/dbeaver/dbeaver
+
+Contacts
+==============
+  dbeaver@jkiss.org       - Technical support, feature suggestions and any other questions.
diff --git a/features/org.jkiss.dbeaver.ce.feature/pom.xml b/features/org.jkiss.dbeaver.ce.feature/pom.xml
index b93d40e0b869..77848f8442d4 100644
--- a/features/org.jkiss.dbeaver.ce.feature/pom.xml
+++ b/features/org.jkiss.dbeaver.ce.feature/pom.xml
@@ -42,30 +42,6 @@
                             <goal>copy-resources</goal>
                         </goals>
                     </execution>
-
-<!--
-                    <execution>
-                        <id>process-macos-info</id>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/generated-macos/DBeaver.app/Contents</outputDirectory>
-                            <overwrite>true</overwrite>
-                            <resources>
-                                <resource>
-                                    <directory>root</directory>
-                                    <includes>
-                                        <include>Info.plist</include>
-                                    </includes>
-                                    <filtering>true</filtering>
-                                </resource>
-                            </resources>
-                        </configuration>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                    </execution>
--->
-
                 </executions>
             </plugin>
         </plugins>
diff --git a/product/appstore/product-branding.properties b/product/appstore/product-branding.properties
index 4394d66e971a..ba193d03598a 100644
--- a/product/appstore/product-branding.properties
+++ b/product/appstore/product-branding.properties
@@ -10,4 +10,4 @@ productCopyright=DBeaver Corp
 productEmail=dbeaver@jkiss.org
 productCompany=DBeaver Corp
 productWebSite=https://dbeaver.io/
-productBundleId=org.jkiss.dbeaver.core.product
+productBundleId=org.jkiss.dbeaver.core.appstore