dbeaver/infra#74 update cloudbeaver launch args (#2682)

* dbeaver/infra#74 update cloudbeaver launch args * dbeaver/dbeaver-infra#74 add generator scripts and move rcp-gen.properties to product repos * dbeaver/dbeaver-infra#74 add copyright config to generator CE * dbeaver/dbeaver-infra#74 move to .ide/idea instead * dbeaver/dbeaver-infra#74 formatting * dbeaver/dbeaver-infra#74 update vscode configs and rename rcp-gen.properties to osgi-app.properties * dbeaver/dbeaver-infra#74 generate workspace per osgi-app.properties file * dbeaver/dbeaver-infra#74 remove workspace from naming --------- Co-authored-by: Serge Rider <[email protected]>
dbeaver · Jun 21, 2024 · 124fa7f · 124fa7f
1 parent af5cbed
commit 124fa7f
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 3 deletions.
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -42,15 +42,15 @@
           "package",
           "-q",
           "exec:java",
-          "-Dexec.args= -eclipse.version ${eclipse-version} -config ${workspaceFolder}/../idea-workspace-dbeaver/rcp-gen.properties -productFile ${workspaceFolder}/server/product/web-server/CloudbeaverServer.product -projectsFolder ${workspaceFolder}/../ -eclipse ${workspaceFolder}/../dbeaver-workspace/dependencies -output ${workspaceFolder}/../dbeaver-workspace/products/CloudbeaverServer.product"
+          "-Dexec.args= -eclipse.version ${eclipse-version} -config ${workspaceFolder}/../idea-workspace-dbeaver/osgi-app.properties -productFile ${workspaceFolder}/server/product/web-server/CloudbeaverServer.product -projectsFolder ${workspaceFolder}/../ -eclipse ${workspaceFolder}/../dbeaver-workspace/dependencies -output ${workspaceFolder}/../dbeaver-workspace/products/CloudbeaverServer.product"
         ]
       },
       "windows": {
         "args": [
           "package",
           "-q",
           "exec:java",
-          "-Dexec.args= -eclipse.version ${eclipse-version} -config ${workspaceFolder}/../idea-workspace-dbeaver/rcp-gen.properties -productFile ${workspaceFolder}/server/product/web-server/CloudbeaverServer.product -projectsFolder ${workspaceFolder}/../ -eclipse ${workspaceFolder}/../dbeaver-workspace/dependencies -output ${workspaceFolder}/../dbeaver-workspace/products/CloudbeaverServer.product"
+          "-Dexec.args= -eclipse.version ${eclipse-version} -config ${workspaceFolder}/../cloudbeaver/osgi-app.properties"
         ]
       },
       "options": {

diff --git a/generate_workspace.cmd b/generate_workspace.cmd
@@ -0,0 +1,3 @@
+SET mypath=%~dp0
+
+.\..\idea-rcp-launch-config-generator\runGenerator.cmd -f %mypath%
diff --git a/generate_workspace.sh b/generate_workspace.sh
@@ -0,0 +1 @@
+./../idea-rcp-launch-config-generator/runGenerator.sh -f $(dirname "$0")
diff --git a/osgi-app.properties b/osgi-app.properties
@@ -0,0 +1,27 @@
+workspaceName=cloudbeaver
+featuresPaths=\
+  dbeaver/features;\
+  cloudbeaver/server/features;
+bundlesPaths=\
+  dbeaver-common/modules;\
+  dbeaver/plugins;\
+  cloudbeaver/server/bundles;
+repositories=\
+  https://p2.dev.dbeaver.com/eclipse-repo/;\
+  https://download.eclipse.org/releases/${eclipse-version}/;
+testBundles=\
+  org.junit;\
+  org.mockito.mockito-core;\
+  junit-jupiter-api;\
+  org.opentest4j
+productsPaths=\
+  dbeaver/product/community/DBeaver.product;\
+  cloudbeaver/server/product/web-server/CloudbeaverServer.product:../../opt/cloudbeaver;
+ideaConfigurationFilesPaths=\
+  dbeaver/.ide/idea/copyright;\
+  dbeaver/.ide/idea/scopes;
+testBundlePaths=\
+  dbeaver/test;\
+  cloudbeaver/server/test;
+additionalModuleRoots=\
+  opt;
diff --git a/server/product/web-server/CloudbeaverServer.product b/server/product/web-server/CloudbeaverServer.product
@@ -7,7 +7,37 @@
 
     <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>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		SET mypath=%~dp0

		.\..\idea-rcp-launch-config-generator\runGenerator.cmd -f %mypath%
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		./../idea-rcp-launch-config-generator/runGenerator.sh -f $(dirname "$0")