dbeaver/dbeaver-infra#187 PRO osgi test runner

osgi-app.properties

@@ -6,7 +6,8 @@ bundlesPaths=\
   dbeaver-common/modules;\
   dbeaver/plugins;\
   cloudbeaver/server/bundles;\
-  dbeaver-jdbc-libsql
+  dbeaver-jdbc-libsql;\
+  cloudbeaver/server/test
 testLibraries=\
   org.junit;\
   org.mockito.mockito-core;\
@@ -22,12 +23,10 @@ testBundles=\
   org.opentest4j
 productsPaths=\
   dbeaver/product/community/DBeaver.product;\
-  cloudbeaver/server/product/web-server/CloudbeaverServer.product:../../opt/cloudbeaver;
+  cloudbeaver/server/product/web-server/CloudbeaverServer.product:../../opt/cloudbeaver;\
+  cloudbeaver/server/product/web-server-test/CloudbeaverServerTest.product:../../opt/cloudbeaver;
 ideaConfigurationFilesPaths=\
   dbeaver/.ide/.idea;
-testBundlePaths=\
-  dbeaver/test;\
-  cloudbeaver/server/test;
 additionalModuleRoots=\
   opt;
 optionalFeatureRepositories=\

server/features/io.cloudbeaver.test.feature/build.properties

@@ -0,0 +1,2 @@
+bin.includes = feature.xml,\
+               feature.properties

server/features/io.cloudbeaver.test.feature/feature.properties

@@ -0,0 +1,4 @@
+featureName=Cloudbeaver Test feature
+providerName=DBeaver Corp
+description=Cloudbeaver Test feature
+copyrightcopyright=\u00A9 2010-2024, DBeaver Corp

server/features/io.cloudbeaver.test.feature/feature.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+        id="io.cloudbeaver.test.feature"
+        label="%featureName"
+        version="1.0.66.qualifier"
+        provider-name="%providerName"
+        plugin="io.cloudbeaver.model">
+
+    <description>
+        %description
+    </description>
+
+    <copyright>
+        %copyright
+    </copyright>
+
+    <plugin id="io.cloudbeaver.test.platform" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+    <!-- Logging -->
+
+</feature>

server/features/io.cloudbeaver.test.feature/pom.xml

@@ -0,0 +1,15 @@
+<?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>io.cloudbeaver</groupId>
+        <artifactId>features</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <artifactId>io.cloudbeaver.ws.feature</artifactId>
+    <version>1.0.66-SNAPSHOT</version>
+    <packaging>eclipse-feature</packaging>
+</project>

server/product/web-server-test/CloudbeaverServerTest.product

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="CloudBeaver ce Server" uid="io.cloudbeaver.product" id="io.cloudbeaver.product.ce.product"
+    application="io.cloudbeaver.product.ce.application" version="24.3.2.qualifier" useFeatures="true"
+    includeLaunchers="false">
+
+    <configIni use="default">
+    </configIni>
+    <launcherArgs>
+        <programArgs>-web-config conf/cloudbeaver.conf -registryMultiLanguage</programArgs>
+        <programArgsMac></programArgsMac>
+        <vmArgs>
+            -Dfile.encoding=UTF-8 
+            --add-modules=ALL-SYSTEM
+            --add-opens=java.base/java.io=ALL-UNNAMED
+            --add-opens=java.base/java.lang=ALL-UNNAMED
+            --add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+            --add-opens=java.base/java.net=ALL-UNNAMED
+            --add-opens=java.base/java.nio=ALL-UNNAMED
+            --add-opens=java.base/java.nio.charset=ALL-UNNAMED
+            --add-opens=java.base/java.text=ALL-UNNAMED
+            --add-opens=java.base/java.time=ALL-UNNAMED
+            --add-opens=java.base/java.util=ALL-UNNAMED
+            --add-opens=java.base/java.util.concurrent=ALL-UNNAMED
+            --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
+            --add-opens=java.base/jdk.internal.vm=ALL-UNNAMED
+            --add-opens=java.base/jdk.internal.misc=ALL-UNNAMED
+            --add-opens=java.base/sun.nio.ch=ALL-UNNAMED
+            --add-opens=java.base/sun.security.ssl=ALL-UNNAMED
+            --add-opens=java.base/sun.security.action=ALL-UNNAMED
+            --add-opens=java.base/sun.security.util=ALL-UNNAMED
+            --add-opens=java.security.jgss/sun.security.jgss=ALL-UNNAMED
+            --add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED
+            --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
+            --add-opens=java.sql/java.sql=ALL-UNNAMED
+        </vmArgs>
+        <vmArgsMac></vmArgsMac>
+    </launcherArgs>
+
+    <license>
+        <url>https://cloudbeaver.io/about/</url>
+        <text>
+            CloudBeaver - Cloud Database Manager
+            Copyright (C) 2019-2022 DBeaver Corp and others
+
+            Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
+            you may not use this file except in compliance with the License.
+            You may obtain a copy of the License at
+
+            http://www.apache.org/licenses/LICENSE-2.0
+
+            Unless required by applicable law or agreed to in writing, software
+            distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
+            WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+            See the License for the specific language governing permissions and
+            limitations under the License.
+        </text>
+    </license>
+
+    <plugins>
+    </plugins>
+
+    <features>
+        <feature id="io.cloudbeaver.product.ce.feature"/>
+        <feature id="io.cloudbeaver.test.feature"/>
+    </features>
+
+    <configurations>
+        <plugin id="org.eclipse.osgi" autoStart="true" startLevel="-1"/>
+        <plugin id="org.apache.felix.scr" autoStart="true" startLevel="1"/>
+        <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4"/>
+    </configurations>
+
+</product>

server/product/web-server-test/CloudbeaverServerTest.product.txt

@@ -0,0 +1,176 @@
+F:\dbeaver-workspace\dbeaver-pro\..\..\cloudbeaver\server\product\web-server\CloudbeaverServer.product
+   -> io.cloudbeaver.product.ce.feature
+    -> io.cloudbeaver.product.ce.feature (already imported)
+    -> io.cloudbeaver.server.feature
+     -> io.cloudbeaver.server.feature (already imported)
+     -> org.eclipse.core.runtime
+      -> org.eclipse.osgi
+       -> org.eclipse.osgi.compatibility.state
+      -> org.eclipse.equinox.common
+      -> org.eclipse.core.jobs
+       --> org.eclipse.osgi
+        -> org.eclipse.osgi.compatibility.state
+      -> org.eclipse.equinox.registry
+       --> org.eclipse.osgi
+        -> org.eclipse.osgi.compatibility.state
+      -> org.eclipse.equinox.preferences
+       -> org.osgi.service.prefs
+       --> org.eclipse.osgi
+        -> org.eclipse.osgi.compatibility.state
+      -> org.eclipse.core.contenttype
+       --> org.eclipse.osgi
+        -> org.eclipse.osgi.compatibility.state
+      -> org.eclipse.equinox.app
+       --> org.eclipse.osgi
+        -> org.eclipse.osgi.compatibility.state
+     -> org.eclipse.equinox.event
+      --> org.eclipse.osgi
+       -> org.eclipse.osgi.compatibility.state
+      -> org.osgi.service.event
+       --> org.eclipse.osgi
+        -> org.eclipse.osgi.compatibility.state
+     -> org.eclipse.osgi.compatibility.state
+     -> org.apache.felix.scr
+      --> org.apache.felix.scr (already imported)
+      -> org.osgi.service.component
+       --> org.eclipse.osgi
+        -> org.eclipse.osgi.compatibility.state
+       -> org.osgi.util.promise
+        -> org.osgi.util.function
+       -> org.osgi.service.component (already imported)
+      --> org.eclipse.osgi
+       -> org.eclipse.osgi.compatibility.state
+     -> io.cloudbeaver.ws.feature
+      -> io.cloudbeaver.ws.feature (already imported)
+      -> org.jkiss.dbeaver.launcher
+      -> org.jkiss.dbeaver.runtime.feature
+       -> org.jkiss.dbeaver.runtime.feature (already imported)
+       -> slf4j.api
+        -> io.cloudbeaver.slf4j
+         -> org.jkiss.bundle.logback
+        --> slf4j.api (already imported)
+       -> bcpg
+        --> bcutil
+         --> bcprov
+        --> bcprov
+       -> bcprov
+       -> bcpkix
+        --> bcutil
+         --> bcprov
+        --> bcprov
+       -> bcutil
+        --> bcprov
+       -> com.github.jsqlparser
+        --> com.github.jsqlparser (already imported)
+       -> org.apache.commons.jexl
+        --> org.apache.commons.logging
+       -> com.google.gson
+        --> com.google.gson (already imported)
+       -> com.jcraft.jsch
+        -> com.sun.jna
+        -> com.sun.jna.platform
+       -> org.apache.commons.logging
+       -> org.objectweb.asm
+       -> org.objectweb.asm.commons
+        --> org.objectweb.asm
+        --> org.objectweb.asm.tree
+         --> org.objectweb.asm
+       -> org.objectweb.asm.tree.analysis
+        --> org.objectweb.asm
+        --> org.objectweb.asm.tree
+         --> org.objectweb.asm
+       -> org.objectweb.asm.tree
+        --> org.objectweb.asm
+       -> org.objectweb.asm.util
+        --> org.objectweb.asm
+        --> org.objectweb.asm.tree.analysis
+         --> org.objectweb.asm
+         --> org.objectweb.asm.tree
+          --> org.objectweb.asm
+        --> org.objectweb.asm.tree
+         --> org.objectweb.asm
+       -> org.apache.aries.spifly.dynamic.bundle
+        --> org.eclipse.osgi
+         -> org.eclipse.osgi.compatibility.state
+        --> org.objectweb.asm.commons
+         --> org.objectweb.asm
+         --> org.objectweb.asm.tree
+          --> org.objectweb.asm
+        --> org.objectweb.asm.util
+         --> org.objectweb.asm
+         --> org.objectweb.asm.tree.analysis
+          --> org.objectweb.asm
+          --> org.objectweb.asm.tree
+           --> org.objectweb.asm
+         --> org.objectweb.asm.tree
+          --> org.objectweb.asm
+        --> org.apache.aries.spifly.dynamic.bundle (already imported)
+        --> org.objectweb.asm
+       -> org.jkiss.utils
+       -> org.jkiss.dbeaver.model
+        -> org.eclipse.equinox.security
+         --> org.eclipse.osgi
+          -> org.eclipse.osgi.compatibility.state
+         --> org.eclipse.core.runtime
+          -> org.eclipse.osgi
+           -> org.eclipse.osgi.compatibility.state
+          -> org.eclipse.equinox.common
+          -> org.eclipse.core.jobs
+           --> org.eclipse.osgi
+            -> org.eclipse.osgi.compatibility.state
+          -> org.eclipse.equinox.registry
+           --> org.eclipse.osgi
+            -> org.eclipse.osgi.compatibility.state
+          -> org.eclipse.equinox.preferences
+           -> org.osgi.service.prefs
+           --> org.eclipse.osgi
+            -> org.eclipse.osgi.compatibility.state
+          -> org.eclipse.core.contenttype
+           --> org.eclipse.osgi
+            -> org.eclipse.osgi.compatibility.state
+          -> org.eclipse.equinox.app
+           --> org.eclipse.osgi
+            -> org.eclipse.osgi.compatibility.state
+         --> org.eclipse.equinox.common
+         --> org.eclipse.equinox.preferences
+          -> org.osgi.service.prefs
+          --> org.eclipse.osgi
+           -> org.eclipse.osgi.compatibility.state
+         --> org.eclipse.core.jobs
+          --> org.eclipse.osgi
+           -> org.eclipse.osgi.compatibility.state
+         --> org.eclipse.equinox.registry
+          --> org.eclipse.osgi
+           -> org.eclipse.osgi.compatibility.state
+         --> org.osgi.service.prefs
+        -> org.eclipse.core.expressions
+        -> org.eclipse.core.net
+         --> com.sun.jna
+         --> com.sun.jna.platform
+        --> bcprov
+        --> bcpkix
+         --> bcutil
+          --> bcprov
+         --> bcprov
+       -> org.jkiss.dbeaver.model.jdbc
+       -> org.jkiss.dbeaver.model.sql
+        -> org.eclipse.text
+         -> org.eclipse.core.commands
+        -> org.jkiss.dbeaver.model.lsm
+         -> org.jkiss.bundle.antlr4
+         --> org.jkiss.utils
+       -> org.jkiss.dbeaver.model.sql.jdbc
+       -> org.jkiss.dbeaver.registry
+        -> org.jkiss.dbeaver.dpi.model
+       -> org.jkiss.dbeaver.net.ssh
+        -> org.eclipse.jsch.core
+       -> org.jkiss.dbeaver.net.ssh.jsch
+       -> org.jkiss.dbeaver.net.ssh.sshj
+        -> org.jkiss.bundle.sshj
+         --> bcprov
+         --> bcpkix
+          --> bcutil
+           --> bcprov
+          --> bcprov
+         --> slf4j.api
+          -> io.cloudbeaver.slf4j

server/product/web-server-test/pom.xml

@@ -0,0 +1,74 @@
+<?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>io.cloudbeaver</groupId>
+        <artifactId>cloudbeaver</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../../</relativePath>
+    </parent>
+    <version>24.3.2-SNAPSHOT</version>
+    <artifactId>web-server-test</artifactId>
+    <packaging>eclipse-repository</packaging>
+    <name>Cloudbeaver Server Product</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>target-platform-configuration</artifactId>
+                <version>${tycho-version}</version>
+                <configuration>
+                    <environments>
+                        <environment>
+                            <os>all</os>
+                            <ws>all</ws>
+                            <arch>all</arch>
+                        </environment>
+                    </environments>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-p2-director-plugin</artifactId>
+                <version>${tycho-version}</version>
+                <configuration>
+                    <products>
+                        <product>
+                            <id>io.cloudbeaver.product</id>
+                            <archiveFileName>cloudbeaver-server-${dbeaver-version}</archiveFileName>
+                        </product>
+                    </products>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>materialize-products</id>
+                        <goals>
+                            <goal>materialize-products</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>archive-products</id>
+                        <goals>
+                            <!--<goal>archive-products</goal>-->
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Disable P2 repository generation -->
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>tycho-p2-repository-plugin</artifactId>
+                <version>${tycho-version}</version>
+                <configuration>
+                    <createArtifactRepository>false</createArtifactRepository>
+                    <skipArchive>true</skipArchive>
+                </configuration>
+            </plugin>
+
+        </plugins>
+    </build>
+</project>