From 124fa7f6910acacfc701ec18ebd9bdd100c37536 Mon Sep 17 00:00:00 2001 From: Georgii Date: Fri, 21 Jun 2024 12:55:32 +0400 Subject: [PATCH] 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 --- .vscode/tasks.json | 4 +-- generate_workspace.cmd | 3 ++ generate_workspace.sh | 1 + osgi-app.properties | 27 ++++++++++++++++ .../web-server/CloudbeaverServer.product | 32 ++++++++++++++++++- 5 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 generate_workspace.cmd create mode 100644 generate_workspace.sh create mode 100644 osgi-app.properties diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 6f716432ea..72ac7ec64d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -42,7 +42,7 @@ "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": { @@ -50,7 +50,7 @@ "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 new file mode 100644 index 0000000000..36c98cf538 --- /dev/null +++ b/generate_workspace.cmd @@ -0,0 +1,3 @@ +SET mypath=%~dp0 + +.\..\idea-rcp-launch-config-generator\runGenerator.cmd -f %mypath% \ No newline at end of file diff --git a/generate_workspace.sh b/generate_workspace.sh new file mode 100644 index 0000000000..55d776c703 --- /dev/null +++ b/generate_workspace.sh @@ -0,0 +1 @@ +./../idea-rcp-launch-config-generator/runGenerator.sh -f $(dirname "$0") \ No newline at end of file diff --git a/osgi-app.properties b/osgi-app.properties new file mode 100644 index 0000000000..77892b61d9 --- /dev/null +++ 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; \ No newline at end of file diff --git a/server/product/web-server/CloudbeaverServer.product b/server/product/web-server/CloudbeaverServer.product index ba76c15ff9..066e0d5ecb 100644 --- a/server/product/web-server/CloudbeaverServer.product +++ b/server/product/web-server/CloudbeaverServer.product @@ -7,7 +7,37 @@ - + + -web-config conf/cloudbeaver.conf -registryMultiLanguage + + + -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 + + + + https://cloudbeaver.io/about/