CB-4161 validate custom config status

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve CloudBeaver
+title: ''
+labels: bug, wait for review
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here, e.g. error log.

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -1,61 +0,0 @@
-name: 🐛 Bug Report
-description: Create a report to help us improve our product
-labels: [wait for review]
-type: Bug
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for reporting a bug in CloudBeaver!
-        To ensure we can address the issue as quickly and efficiently as possible, please provide as much detail as you can in the fields below.
-  - type: textarea
-    id: description
-    attributes:
-      label: Description
-      description: |
-        A clear and concise description of the issue being addressed.
-         - Describe the actual problematic behavior.
-         - Ensure private information is redacted.
-         - Include console output or log files if relevant.
-         - If applicable, add screenshots or screen recordings to help explain your problem.
-      placeholder: |
-        Please enter a description of the issue. Here you can also attach log files, screenshots or a video
-    validations:
-      required: true
-  - type: textarea
-    id: reproduce
-    attributes:
-      label: Steps to reproduce
-      description: Describe the steps to reproduce the bug
-      placeholder: |
-        1. Go to '...'
-        2. Click on '....'
-        3. Scroll down to '....'
-        4. See error
-  - type: textarea
-    id: expected
-    attributes:
-      label: Expected/Desired Behavior
-      description: |
-        A clear and concise description of what happens in the software **after** a fix is created and merged.
-    validations:
-      required: true
-  - type: input
-    id: version
-    attributes:
-      label: CloudBeaver Version
-      description: What version of CloudBeaver are you running?
-      placeholder: ex. CloudBeaver Community 25.0.0
-    validations:
-      required: true
-  - type: textarea
-    id: additional-context
-    attributes:
-      label: Additional context
-      description: Any additional context about the environment
-      placeholder: |
-        Example:
-        1. OS: [e.g. iOS, Ubuntu, Windows 11]
-        2. Browser: [e.g. Chrome, Safari]
-    validations:
-      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,14 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Read our documentations
-    url: https://dbeaver.com/docs/cloudbeaver
-    about: Many articles about product deployment and features.
-  - name: Try advanced database management features in DBeaver PRO or CloudBeaver EE
-    url: https://dbeaver.com/download/?utm_source=github&utm_medium=social&utm_campaign=issue
-    about: Download a 14-day free trial on dbeaver.com. No credit card is needed.
-  - name: Learn how to use CloudBeaver effectively with our tutorial videos
-    url: https://www.youtube.com/channel/UC-yOjsQLSaJVEghg6UB3N7A
-    about: Subscribe to our YouTube channel and watch new tutorials every week.
-  - name: Follow us on X (ex. Twitter)
-    url: https://x.com/dbeaver_news
-    about: Get everyday tips, fresh news, and DBeaver/CloudBeaver feature overviews.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,9 +1,8 @@
 ---
-name: Feature Request
-about: Provide a description of your feature request for CloudBeaver. Include the problem you are trying to solve, why it is important, and any specific functionality you believe would improve the platform.
+name: Feature request
+about: Suggest an idea for CloudBeaver
 title: ''
-labels: wait for review
-type: Feature
+labels: feature request, wait for review
 assignees: ''
 
 ---
@@ -13,9 +12,3 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/question.md

@@ -1,9 +1,8 @@
 ---
 name: Question
-about: Is there something unclear? Ask your question.
+about: Is there something unclear?
 title: ''
-labels: wait for review
-type: Question
+labels: question, wait for review
 assignees: ''
 
 ---

.github/workflows/backend-build.yml

@@ -1,42 +0,0 @@
-name: Backend Build
-
-on:
-  # Allows you to reuse workflows by referencing their YAML files
-  workflow_call:
-
-jobs:
-  build-backend:
-    name: Build
-    timeout-minutes: 10
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          path: cloudbeaver
-
-      - name: Clone Deps Repositories
-        uses: dbeaver/github-actions/clone-repositories@devel
-        with:
-          project_deps_path: "./cloudbeaver/project.deps"
-
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          distribution: "temurin"
-          java-version: "21"
-          cache: maven
-
-      - uses: dbeaver/github-actions/install-maven@devel
-
-      - name: Run build script
-        run: ./build-backend.sh
-        shell: bash
-        working-directory: ./cloudbeaver/deploy
-
-      # - name: Archive build artifacts
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: backend-build-artifacts
-      #     path: cloudbeaver/deploy/cloudbeaver
-      #     if-no-files-found: error

.github/workflows/commit-msgs-validator.yml

@@ -0,0 +1,17 @@
+name: "Commit Message Validation"
+
+on:
+  pull_request:
+    branches:
+      - devel
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - edited
+      - ready_for_review
+      - labeled
+      
+jobs:
+  validate-commit-message:
+    uses: dbeaver/dbeaver/.github/workflows/reused-commit-msgs-validator.yml@devel

.github/workflows/common-cleanup.yml

@@ -1,14 +0,0 @@
-name: Cleanup
-
-on:
-  pull_request:
-    types: [closed]
-  push:
-    branches:
-      - devel
-
-jobs:
-  delete-caches:
-    name: Cleanup
-    uses: dbeaver/dbeaver-common/.github/workflows/cleanup-caches.yml@devel
-    secrets: inherit

.github/workflows/docker-build-and-push.yml

@@ -1,93 +0,0 @@
-name: Build and Push Docker Image
-
-on:
-  # Allows you to run this workflow manually from the Actions tab
-  workflow_dispatch:
-
-  # Allows you to reuse workflows by referencing their YAML files
-  workflow_call:
-
-jobs:
-  build-and-push-docker:
-    name: Build and Push Docker Image
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Download backend artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: backend-build-artifacts
-          path: deploy/cloudbeaver/
-
-      - name: Download frontend artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: frontend-build-artifacts
-          path: deploy/cloudbeaver/web
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Run custom Docker build script
-        run: ./make-docker-container.sh
-        shell: bash
-        working-directory: ./deploy/docker
-
-      - name: Tag Docker Image
-        run: |
-          REPO_NAME=$(basename ${{ github.repository }})
-          IMAGE_NAME=ghcr.io/${{ github.repository_owner }}/$REPO_NAME
-          BRANCH_NAME=${{ github.head_ref || github.ref_name }}
-          TAG_NAME=$(echo $BRANCH_NAME | sed 's/[^a-zA-Z0-9._-]/-/g')
-          docker tag dbeaver/cloudbeaver:dev $IMAGE_NAME:$TAG_NAME
-          echo "image=$IMAGE_NAME:$TAG_NAME" >> $GITHUB_ENV
-
-      # - name: Install Docker Credential Helper
-      #   run: |
-      #     sudo apt-get update
-      #     sudo apt-get install -y gnupg2 pass
-      #     curl -fsSL https://github.com/docker/docker-credential-helpers/releases/download/v0.6.4/docker-credential-pass-v0.6.4-amd64.tar.gz -o docker-credential-pass.tar.gz
-      #     tar xzvf docker-credential-pass.tar.gz
-      #     sudo mv docker-credential-pass /usr/local/bin/docker-credential-pass
-      #     sudo chmod +x /usr/local/bin/docker-credential-pass
-  
-      # - name: Configure Docker to use Credential Helper
-      #   run: |
-      #     mkdir -p ~/.docker
-      #     echo '{"credsStore":"pass"}' > ~/.docker/config.json
-
-      # - name: Initialize Password Store
-      #   run: |
-      #     gpg --batch --gen-key <<EOF
-      #     %no-protection
-      #     Key-Type: default
-      #     Subkey-Type: default
-      #     Name-Real: Docker Credential Helper
-      #     Expire-Date: 0
-      #     %commit
-      #     EOF
-      #     pass init "$(gpg --list-keys --with-colons | grep '^pub' | cut -d: -f5)"
-
-      - name: Log in to GitHub Container Registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
-
-      - name: Push Docker Image
-        run: docker push ${{ env.image }}
-
-      # - name: Comment on Pull Request
-      #   if: github.event_name == 'pull_request'
-      #   uses: actions/github-script@v6
-      #   with:
-      #     github-token: ${{ secrets.PAT }}
-      #     script: |
-      #       const tag = process.env.TAG_NAME;
-      #       const commentBody = `The Docker image has been built and pushed to Docker Hub.\n\nYou can pull the image using the following command:\n\`\`\`\ndocker pull dbeaver/cloudbeaver:${tag}\n\`\`\``;
-      #       github.rest.issues.createComment({
-      #         owner: context.repo.owner,
-      #         repo: context.repo.repo,
-      #         issue_number: context.issue.number,
-      #         body: commentBody
-      #       });

.github/workflows/frontend-build.yml

@@ -1,79 +0,0 @@
-name: Frontend Build
-
-on:
-  # Allows you to reuse workflows by referencing their YAML files
-  workflow_call:
-    outputs:
-      build-status:
-        description: "Build status"
-        value: ${{ jobs.frontend-build.outputs.build-status }}
-      test-status:
-        description: "Test status"
-        value: ${{ jobs.frontend-build.outputs.test-status }}
-    inputs:
-      clean-cache:
-        required: false
-        type: boolean
-
-jobs:
-  frontend-build:
-    name: Build
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    permissions:
-      contents: read
-
-    outputs:
-      build-status: ${{ steps.build.outcome }}
-      test-status: ${{ steps.test.outcome }}
-
-    defaults:
-      run:
-        working-directory: ./cloudbeaver/webapp
-
-    steps:
-      - name: Checkout cloudbeaver
-        uses: actions/checkout@v4
-        with:
-          path: cloudbeaver
-
-      - name: Clone Deps Repositories
-        uses: dbeaver/github-actions/clone-repositories@devel
-        with:
-          project_deps_path: "./cloudbeaver/project.deps"
-          token: ${{ secrets.DEVOPS_ISSUE_RO_TOKEN }}
-
-      - run: corepack enable
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "lts/*"
-          cache: "yarn"
-          cache-dependency-path: |
-            cloudbeaver/webapp/yarn.lock
-
-      - name: restore typescript cache
-        uses: actions/cache@v4
-        with:
-          path: |
-            "cloudbeaver/webapp/common-*/**/*/lib"
-            "cloudbeaver/webapp/**/packages/*/dist"
-          key: ${{ runner.os }}-dist-${{ hashFiles('cloudbeaver/webapp/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-dist-
-
-      - if: inputs.clean-cache
-        run: yarn clear
-
-      - run: yarn install --immutable
-
-      - run: yarn bundle
-        working-directory: ./cloudbeaver/webapp/packages/product-default
-
-      - run: yarn test
-
-      # - name: Archive build artifacts
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: frontend-build-artifacts
-      #     path: webapp/packages/product-default/lib
-      #     if-no-files-found: error

.github/workflows/frontend-lint.yml

@@ -1,46 +0,0 @@
-name: Frontend Lint
-
-on:
-  # Allows you to reuse workflows by referencing their YAML files
-  workflow_call:
-
-jobs:
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    permissions:
-      contents: read
-
-    defaults:
-      run:
-        working-directory: ./cloudbeaver/webapp
-
-    steps:
-      - name: Checkout cloudbeaver
-        uses: actions/checkout@v4
-        with:
-          path: cloudbeaver
-
-      - run: corepack enable
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "lts/*"
-          cache: "yarn"
-          cache-dependency-path: "./cloudbeaver/webapp/yarn.lock"
-
-      # - run: yarn install --immutable
-      #   working-directory: ./cloudbeaver/webapp/common-typescript
-
-      # - run: yarn install --immutable
-      #   working-directory: ./cloudbeaver/webapp/common-react
-
-      - run: |
-          yarn install --immutable
-          git fetch origin "${{ github.base_ref }}" --depth=1
-          FILES=$(git diff --name-only 'origin/${{ github.base_ref }}' ${{ github.sha }} -- . | sed 's|^webapp/||')
-          if [ -n "$FILES" ]; then
-            yarn lint --pass-on-no-patterns --no-error-on-unmatched-pattern $FILES
-          else
-            echo "No files to lint"
-          fi

.github/workflows/jest-tests-runner.yml

@@ -0,0 +1,72 @@
+name: Run Jest Tests
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the "devel" branch
+  pull_request:
+    branches: ["devel"]
+    paths:
+      - "webapp/**" # monitor for the frontend changes
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  run-jest-tests:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./webapp
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "18"
+
+      - name: Cache node modules
+        id: cache-npm
+        uses: actions/cache@v3
+        env:
+          cache-name: cache-node-modules
+        with:
+          # npm cache files are stored in `~/.npm` on Linux/macOS
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - if: ${{ steps.cache-npm.outputs.cache-hit != 'true' }}
+        name: List the state of node modules
+        continue-on-error: true
+        run: npm list
+
+      - name: Run install
+        uses: borales/actions-yarn@v4
+        with:
+          dir: webapp
+          cmd: install
+
+      - name: Run lerna bootstrap
+        uses: borales/actions-yarn@v4
+        with:
+          dir: webapp
+          cmd: lerna bootstrap
+
+      - name: Run pre test
+        uses: borales/actions-yarn@v4
+        with:
+          dir: webapp
+          cmd: pretest
+
+      - name: Run test
+        uses: borales/actions-yarn@v4
+        with:
+          dir: webapp
+          cmd: lerna run test

.github/workflows/push-pr-devel.yml

@@ -1,64 +0,0 @@
-name: CI
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-  push:
-    branches: [devel]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.ref_name }}
-  cancel-in-progress: true
-
-jobs:
-  build-server:
-    uses: dbeaver/dbeaver-common/.github/workflows/mvn-package.yml@devel
-    name: Check
-    secrets: inherit
-    with:
-      mvn-args: -Dplain-api-server -Dheadless-platform
-      project-directory: ./cloudbeaver/server/product/aggregate
-      project-deps: ./cloudbeaver/project.deps
-      timeout-minutes: 5
-
-  # build-server:
-  #   name: Server
-  #   uses: ./.github/workflows/backend-build.yml
-  #   secrets: inherit
-
-  build-frontend:
-    name: Frontend
-    uses: ./.github/workflows/frontend-build.yml
-    secrets: inherit
-
-  lint-server:
-    name: Server
-    uses: dbeaver/dbeaver-common/.github/workflows/java-checkstyle.yml@devel
-    secrets: inherit
-
-  lint-frontend:
-    name: Frontend
-    uses: ./.github/workflows/frontend-lint.yml
-    secrets: inherit
-
-  # call-frontend-tests:
-  #   name: Frontend Unit Tests
-  #   needs: call-frontend-build
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - name: Check if tests passed
-  #       if: ${{ needs.call-frontend-build.outputs.test-status != 'success' }}
-  #       run: |
-  #         echo "Tests failed"
-  #         exit 1
-  #     - name: Continue if tests passed
-  #       if: ${{ needs.call-frontend-build.outputs.test-status == 'success' }}
-  #       run: echo "Tests passed"
-
-  # call-docker-build-and-push:
-  #   name: Run
-  #   needs: [call-backend-build, call-frontend-build]
-  #   uses: ./.github/workflows/docker-build-and-push.yml

.gitignore

@@ -26,7 +26,7 @@ dist/
 
 *.iml
 /idea/
-
+.idea/
 
 ## Mac OS
 .DS_Store
@@ -40,11 +40,6 @@ server/test/io.cloudbeaver.test.platform/workspace/.data/
 .classpath
 .settings/
 
-## Eclipse PDE
-*.product.launch
-
-workspace-dev-ce/
 deploy/cloudbeaver
 server/**/target
-apps/**/target
-osgi-cache/
+apps/**/target

.vscode/extensions.json

@@ -15,11 +15,11 @@
     "streetsidesoftware.code-spell-checker",
     "streetsidesoftware.code-spell-checker-russian",
     "syler.sass-indented",
-    "github.copilot-chat",
+    "VisualStudioExptTeam.intellicode-api-usage-examples",
+    "VisualStudioExptTeam.vscodeintellicode",
     "yzhang.markdown-all-in-one",
     "GraphQL.vscode-graphql-syntax",
     "mrmlnc.vscode-json5",
-    "esbenp.prettier-vscode",
-    "devnaumov.licensify"
+    "esbenp.prettier-vscode"
   ]
-}
+}

.vscode/launch.json

@@ -4,73 +4,82 @@
     {
       "type": "chrome",
       "request": "launch",
-      "name": "CloudBeaver CE",
-      "url": "http://localhost:8080",
-      "webRoot": "${workspaceFolder}/..",
-      "outFiles": [
-        "${workspaceFolder}/../cloudbeaver/webapp/packages/**/dist/**/*.{js,jsx}"
-      ],
-      "smartStep": true,
-      "sourceMaps": true,
-      "disableNetworkCache": true,
-      "skipFiles": ["<node_internals>/**", "**/node_modules/**"]
+      "name": "Debug CE",
+      "url": "http://127.0.0.1:3100",
+      "webRoot": "${workspaceFolder}/webapp/packages/product-default"
     },
     {
       "type": "java",
-      "name": "CloudBeaver CE Server",
-      "cwd": "${workspaceFolder}/../dbeaver-workspace/app-workspace/cbce",
+      "name": "CloudBeaver CE",
+      "cwd": "${workspaceFolder}/../opt/cbce",
       "request": "launch",
-      "mainClass": "org.jkiss.dbeaver.launcher.DBeaverLauncher",
-      "args": [
-        "-product",
-        "io.cloudbeaver.product.ce.product",
-        "-configuration",
-        "file:${workspaceFolder}/../dbeaver-workspace/products/CloudbeaverServer.product/",
-        "-dev",
-        "file:${workspaceFolder}/../dbeaver-workspace/products/CloudbeaverServer.product/dev.properties",
-        "-nl",
-        "en",
-        "-web-config",
-        "conf/cloudbeaver.conf",
-        "-registryMultiLanguage"
+      "mainClass": "org.eclipse.equinox.launcher.Main",
+      "classPaths": [
+        "${env:DBEAVER_DEVEL_ECLIPSE_PATH}/plugins/org.eclipse.equinox.launcher_1.6.400.v20210924-0641.jar"
       ],
-      // "windows": {
-      //   "args": ["-os", "win32", "-ws", "win32", "-arch", "x86_64"]
-      // },
-      // "osx": {
-      //   "args": ["-os", "macosx", "-ws", "cocoa", "-arch", "aarch64"]
-      // },
-
-      "vmArgs": [
-        "-XX:+IgnoreUnrecognizedVMOptions",
-        "-Xms64m",
-        "-Xmx1024m",
-        "-Declipse.pde.launch=true",
-        "-XstartOnFirstThread",
-        "-Dfile.encoding=UTF-8",
-        "--add-modules=ALL-DEFAULT",
-        "--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"
-      ]
+      "windows": {
+        "type": "java",
+        "name": "CloudBeaver CE",
+        "request": "launch",
+        "mainClass": "org.eclipse.equinox.launcher.Main",
+        "args": [
+          "-product",
+          "io.cloudbeaver.product.ce.product",
+          "-configuration",
+          "file:${env:DBEAVER_DEVEL_ECLIPSE_WORKSPACE_PATH}/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/",
+          "-dev",
+          "file:${env:DBEAVER_DEVEL_ECLIPSE_WORKSPACE_PATH}/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/dev.properties",
+          "-os",
+          "win32",
+          "-ws",
+          "win32",
+          "-arch",
+          "x86_64",
+          "-nl",
+          "en",
+          "-showsplash",
+          "-web-config",
+          "conf/cloudbeaver.conf"
+        ],
+        "vmArgs": [
+          "-XX:+IgnoreUnrecognizedVMOptions",
+          "--add-modules=ALL-SYSTEM",
+          "-Xms64m",
+          "-Xmx1024m",
+          "-Declipse.pde.launch=true"
+        ]
+      },
+      "osx": {
+        "type": "java",
+        "name": "CloudBeaver CE",
+        "request": "launch",
+        "mainClass": "org.eclipse.equinox.launcher.Main",
+        "args": [
+          "-product",
+          "io.cloudbeaver.product.ce.product",
+          "-configuration",
+          "file:${env:DBEAVER_DEVEL_ECLIPSE_WORKSPACE_PATH}/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/",
+          "-dev",
+          "file:${env:DBEAVER_DEVEL_ECLIPSE_WORKSPACE_PATH}/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/dev.properties",
+          "-os",
+          "macosx",
+          "-ws",
+          "cocoa",
+          "-arch",
+          "aarch64",
+          "-nl",
+          "en_US",
+          "-showsplash"
+        ],
+        "vmArgs": [
+          "-XX:+IgnoreUnrecognizedVMOptions",
+          "--add-modules=ALL-SYSTEM",
+          "-Xms64m",
+          "-Xmx1024m",
+          "-Declipse.pde.launch=true",
+          "-XstartOnFirstThread"
+        ]
+      }
     }
   ]
 }

.vscode/license.code-snippets

@@ -0,0 +1,17 @@
+{
+  "license": {
+    "scope": "typescript,typescriptreact,javascript,javascriptreact",
+    "prefix": "license",
+    "body": [
+      "/*",
+      " * CloudBeaver - Cloud Database Manager",
+      " * Copyright (C) 2020-2023 DBeaver Corp and others",
+      " *",
+      " * Licensed under the Apache License, Version 2.0.",
+      " * you may not use this file except in compliance with the License.",
+      " */",
+      "",
+      ""
+    ]
+  }
+}

.vscode/settings.json

@@ -2,18 +2,18 @@
   "editor.tabSize": 2,
   "editor.formatOnSave": true,
   "editor.linkedEditing": true,
+
   "task.autoDetect": "off",
+
   "java.configuration.updateBuildConfiguration": "automatic",
   "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx16G -Xms100m -Xlog:disable",
   "java.compile.nullAnalysis.mode": "automatic",
-  "typescript.preferences.useAliasesForRenames": false,
+
   "typescript.preferences.importModuleSpecifier": "relative",
   "typescript.preferences.includePackageJsonAutoImports": "on",
   "typescript.preferences.quoteStyle": "single",
-  "typescript.tsdk": "webapp/.yarn/sdks/typescript/lib",
-  "typescript.enablePromptUseWorkspaceTsdk": true,
-  "prettier.prettierPath": "webapp/.yarn/sdks/prettier/index.cjs",
-  "eslint.nodePath": "webapp/.yarn/sdks",
+  "typescript.tsdk": "webapp/node_modules/typescript/lib",
+
   "eslint.enable": true,
   "eslint.validate": [
     "javascript",
@@ -21,9 +21,9 @@
     "typescript",
     "typescriptreact"
   ],
-  "eslint.workingDirectories": [
-    "webapp"
-  ],
+  "eslint.packageManager": "yarn",
+  "eslint.workingDirectories": ["webapp"],
+
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "[javascript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -40,10 +40,12 @@
   "[java]": {
     "editor.defaultFormatter": "redhat.java"
   },
+
   "files.eol": "\n",
   "files.associations": {
     "*.css": "postcss"
   },
-  "java.checkstyle.configuration": "${workspaceFolder}/../dbeaver-common/.github/dbeaver-checkstyle-config.xml",
+
+  "java.checkstyle.configuration": "${workspaceFolder}/../dbeaver/dbeaver-checkstyle-config.xml",
   "java.checkstyle.version": "10.12.0"
-}
+}

.vscode/tasks.json

@@ -13,31 +13,11 @@
   },
   "tasks": [
     {
-      "label": "Run Tests CE",
+      "label": "Run Tests",
       "type": "shell",
       "command": "yarn",
       "group": "test",
-      "args": ["test"]
-    },
-    {
-      "label": "Run Tests Common Typescript",
-      "type": "shell",
-      "command": "yarn",
-      "group": "test",
-      "args": ["test"],
-      "options": {
-        "cwd": "${workspaceFolder}/webapp/common-typescript"
-      }
-    },
-    {
-      "label": "Run Tests Common React",
-      "type": "shell",
-      "command": "yarn",
-      "group": "test",
-      "args": ["test"],
-      "options": {
-        "cwd": "${workspaceFolder}/webapp/common-react"
-      }
+      "args": ["lerna", "run", "test", "--no-bail", "--stream", "--"]
     },
     {
       "label": "Run DevServer CE",
@@ -53,33 +33,10 @@
         "cwd": "${workspaceFolder}/webapp/packages/product-default"
       }
     },
-    {
-      "label": "Generate Eclipse PDE CloudBeaver",
-      "type": "shell",
-      "osx": {
-        "command": "./generate_workspace.sh"
-      },
-      "windows": {
-        "command": "./generate_workspace.cmd"
-      },
-      "options": {
-        "cwd": "${workspaceFolder}/../cloudbeaver"
-      },
-      "presentation": {
-        "reveal": "silent",
-        "close": true,
-        "clear": false
-      }
-    },
     {
       "label": "Build CE",
       "type": "shell",
-      "windows": {
-        "command": "./build.bat"
-      },
-      "osx": {
-        "command": "./build.sh"
-      },
+      "command": "./build-sqlite.bat",
       "options": {
         "cwd": "${workspaceFolder}/deploy"
       },
@@ -88,63 +45,22 @@
         "isDefault": true
       }
     },
-    {
-      "label": "Run Backend CE",
-      "type": "shell",
-      "windows": {
-        "command": "./run-cloudbeaver-server.bat"
-      },
-      "osx": {
-        "command": "./run-cloudbeaver-server.sh"
-      },
-      "options": {
-        "cwd": "${workspaceFolder}/deploy/cloudbeaver"
-      }
-    },
     {
       "label": "Yarn Install",
       "type": "shell",
-      "command": "yarn install",
-      "args": [],
-      "presentation": {
-        "reveal": "silent",
-        "close": true,
-        "clear": false
-      }
+      "command": "yarn",
+      "args": []
     },
     {
-      "label": "Clean CE",
-      "type": "shell",
-      "command": "yarn clear",
-      "options": {
-        "cwd": "${workspaceFolder}/webapp"
-      }
-    },
-    {
-      "label": "Add Custom Plugin",
-      "type": "shell",
-      "command": "yarn run add-plugin",
-      "options": {
-        "cwd": "${workspaceFolder}/webapp/packages"
-      }
-    },
-    {
-      "label": "Run Ui Kit Preview",
+      "label": "Lerna Bootstrap",
       "type": "shell",
       "command": "yarn",
-      "options": {
-        "cwd": "${workspaceFolder}/webapp/common-react/@dbeaver/ui-kit"
-      },
-      "args": ["docs"]
+      "args": ["lerna", "bootstrap"]
     },
     {
-      "label": "Run Storybook",
-      "type": "shell",
-      "command": "yarn",
-      "options": {
-        "cwd": "${workspaceFolder}/webapp/packages/storybook"
-      },
-      "args": ["storybook"]
+      "label": "Bootstrap",
+      "dependsOrder": "sequence",
+      "dependsOn": ["Yarn Install", "Lerna Bootstrap"]
     }
   ],
   "inputs": [
@@ -152,8 +68,8 @@
       "type": "pickString",
       "id": "stage.ce",
       "description": "CE Stage servers",
-      "default": "http://localhost:8978/",
-      "options": ["http://localhost:8978/"]
+      "default": "http://127.0.0.1:8978/",
+      "options": ["http://127.0.0.1:8978/"]
     }
   ]
 }

.vscode/vscode-java-configs/.editorconfig

@@ -1,10 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-
-[*.{js,json,yml}]
-charset = utf-8
-indent_style = space
-indent_size = 2

.vscode/vscode-java-configs/.gitattributes

@@ -1,4 +0,0 @@
-/.yarn/**            linguist-vendored
-/.yarn/releases/*    binary
-/.yarn/plugins/**/*  binary
-/.pnp.*              binary linguist-generated

.vscode/vscode-java-configs/.gitignore

@@ -1,14 +0,0 @@
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
-!.yarn/sdks/**
-
-# Swap the comments on the following lines if you wish to use zero-installs
-# In that case, don't forget to run `yarn config set enableGlobalCache false`!
-# Documentation here: https://yarnpkg.com/features/caching#zero-installs
-
-#!.yarn/cache
-.pnp.*

.vscode/vscode-java-configs/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-  "recommendations": [
-    "arcanis.vscode-zipfs"
-  ]
-}

.vscode/vscode-java-configs/.vscode/settings.json

@@ -1,8 +0,0 @@
-{
-  "search.exclude": {
-    "**/.yarn": true,
-    "**/.pnp.*": true
-  },
-  "typescript.tsdk": ".yarn/sdks/typescript/lib",
-  "typescript.enablePromptUseWorkspaceTsdk": true
-}

.vscode/vscode-java-configs/.yarn/sdks/integrations.yml

@@ -1,5 +0,0 @@
-# This file is automatically generated by @yarnpkg/sdks.
-# Manual changes might be lost!
-
-integrations:
-  - vscode

.vscode/vscode-java-configs/.yarn/sdks/typescript/bin/tsc

@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/bin/tsc
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-// Defer to the real typescript/bin/tsc your application uses
-module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsc`));

.vscode/vscode-java-configs/.yarn/sdks/typescript/bin/tsserver

@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/bin/tsserver
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-// Defer to the real typescript/bin/tsserver your application uses
-module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsserver`));

.vscode/vscode-java-configs/.yarn/sdks/typescript/lib/tsc.js

@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/tsc.js
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-// Defer to the real typescript/lib/tsc.js your application uses
-module.exports = wrapWithUserWrapper(absRequire(`typescript/lib/tsc.js`));

.vscode/vscode-java-configs/.yarn/sdks/typescript/lib/tsserver.js

@@ -1,248 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/tsserver.js
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-const moduleWrapper = exports => {
-  return wrapWithUserWrapper(moduleWrapperFn(exports));
-};
-
-const moduleWrapperFn = tsserver => {
-  if (!process.versions.pnp) {
-    return tsserver;
-  }
-
-  const {isAbsolute} = require(`path`);
-  const pnpApi = require(`pnpapi`);
-
-  const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
-  const isPortal = str => str.startsWith("portal:/");
-  const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
-
-  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
-    return `${locator.name}@${locator.reference}`;
-  }));
-
-  // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
-  // doesn't understand. This layer makes sure to remove the protocol
-  // before forwarding it to TS, and to add it back on all returned paths.
-
-  function toEditorPath(str) {
-    // We add the `zip:` prefix to both `.zip/` paths and virtual paths
-    if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) {
-      // We also take the opportunity to turn virtual paths into physical ones;
-      // this makes it much easier to work with workspaces that list peer
-      // dependencies, since otherwise Ctrl+Click would bring us to the virtual
-      // file instances instead of the real ones.
-      //
-      // We only do this to modules owned by the the dependency tree roots.
-      // This avoids breaking the resolution when jumping inside a vendor
-      // with peer dep (otherwise jumping into react-dom would show resolution
-      // errors on react).
-      //
-      const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
-      if (resolved) {
-        const locator = pnpApi.findPackageLocator(resolved);
-        if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
-          str = resolved;
-        }
-      }
-
-      str = normalize(str);
-
-      if (str.match(/\.zip\//)) {
-        switch (hostInfo) {
-          // Absolute VSCode `Uri.fsPath`s need to start with a slash.
-          // VSCode only adds it automatically for supported schemes,
-          // so we have to do it manually for the `zip` scheme.
-          // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
-          //
-          // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
-          //
-          // 2021-10-08: VSCode changed the format in 1.61.
-          // Before | ^zip:/c:/foo/bar.zip/package.json
-          // After  | ^/zip//c:/foo/bar.zip/package.json
-          //
-          // 2022-04-06: VSCode changed the format in 1.66.
-          // Before | ^/zip//c:/foo/bar.zip/package.json
-          // After  | ^/zip/c:/foo/bar.zip/package.json
-          //
-          // 2022-05-06: VSCode changed the format in 1.68
-          // Before | ^/zip/c:/foo/bar.zip/package.json
-          // After  | ^/zip//c:/foo/bar.zip/package.json
-          //
-          case `vscode <1.61`: {
-            str = `^zip:${str}`;
-          } break;
-
-          case `vscode <1.66`: {
-            str = `^/zip/${str}`;
-          } break;
-
-          case `vscode <1.68`: {
-            str = `^/zip${str}`;
-          } break;
-
-          case `vscode`: {
-            str = `^/zip/${str}`;
-          } break;
-
-          // To make "go to definition" work,
-          // We have to resolve the actual file system path from virtual path
-          // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
-          case `coc-nvim`: {
-            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
-            str = resolve(`zipfile:${str}`);
-          } break;
-
-          // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server)
-          // We have to resolve the actual file system path from virtual path,
-          // everything else is up to neovim
-          case `neovim`: {
-            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
-            str = `zipfile://${str}`;
-          } break;
-
-          default: {
-            str = `zip:${str}`;
-          } break;
-        }
-      } else {
-        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
-      }
-    }
-
-    return str;
-  }
-
-  function fromEditorPath(str) {
-    switch (hostInfo) {
-      case `coc-nvim`: {
-        str = str.replace(/\.zip::/, `.zip/`);
-        // The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
-        // So in order to convert it back, we use .* to match all the thing
-        // before `zipfile:`
-        return process.platform === `win32`
-          ? str.replace(/^.*zipfile:\//, ``)
-          : str.replace(/^.*zipfile:/, ``);
-      } break;
-
-      case `neovim`: {
-        str = str.replace(/\.zip::/, `.zip/`);
-        // The path for neovim is in format of zipfile:///<pwd>/.yarn/...
-        return str.replace(/^zipfile:\/\//, ``);
-      } break;
-
-      case `vscode`:
-      default: {
-        return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
-      } break;
-    }
-  }
-
-  // Force enable 'allowLocalPluginLoads'
-  // TypeScript tries to resolve plugins using a path relative to itself
-  // which doesn't work when using the global cache
-  // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
-  // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
-  // TypeScript already does local loads and if this code is running the user trusts the workspace
-  // https://github.com/microsoft/vscode/issues/45856
-  const ConfiguredProject = tsserver.server.ConfiguredProject;
-  const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
-  ConfiguredProject.prototype.enablePluginsWithOptions = function() {
-    this.projectService.allowLocalPluginLoads = true;
-    return originalEnablePluginsWithOptions.apply(this, arguments);
-  };
-
-  // And here is the point where we hijack the VSCode <-> TS communications
-  // by adding ourselves in the middle. We locate everything that looks
-  // like an absolute path of ours and normalize it.
-
-  const Session = tsserver.server.Session;
-  const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
-  let hostInfo = `unknown`;
-
-  Object.assign(Session.prototype, {
-    onMessage(/** @type {string | object} */ message) {
-      const isStringMessage = typeof message === 'string';
-      const parsedMessage = isStringMessage ? JSON.parse(message) : message;
-
-      if (
-        parsedMessage != null &&
-        typeof parsedMessage === `object` &&
-        parsedMessage.arguments &&
-        typeof parsedMessage.arguments.hostInfo === `string`
-      ) {
-        hostInfo = parsedMessage.arguments.hostInfo;
-        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
-          const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match(
-            // The RegExp from https://semver.org/ but without the caret at the start
-            /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
-          ) ?? []).map(Number)
-
-          if (major === 1) {
-            if (minor < 61) {
-              hostInfo += ` <1.61`;
-            } else if (minor < 66) {
-              hostInfo += ` <1.66`;
-            } else if (minor < 68) {
-              hostInfo += ` <1.68`;
-            }
-          }
-        }
-      }
-
-      const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => {
-        return typeof value === 'string' ? fromEditorPath(value) : value;
-      });
-
-      return originalOnMessage.call(
-        this,
-        isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON)
-      );
-    },
-
-    send(/** @type {any} */ msg) {
-      return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
-        return typeof value === `string` ? toEditorPath(value) : value;
-      })));
-    }
-  });
-
-  return tsserver;
-};
-
-const [major, minor] = absRequire(`typescript/package.json`).version.split(`.`, 2).map(value => parseInt(value, 10));
-// In TypeScript@>=5.5 the tsserver uses the public TypeScript API so that needs to be patched as well.
-// Ref https://github.com/microsoft/TypeScript/pull/55326
-if (major > 5 || (major === 5 && minor >= 5)) {
-  moduleWrapper(absRequire(`typescript`));
-}
-
-// Defer to the real typescript/lib/tsserver.js your application uses
-module.exports = moduleWrapper(absRequire(`typescript/lib/tsserver.js`));

.vscode/vscode-java-configs/.yarn/sdks/typescript/lib/tsserverlibrary.js

@@ -1,248 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript/lib/tsserverlibrary.js
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-const moduleWrapper = exports => {
-  return wrapWithUserWrapper(moduleWrapperFn(exports));
-};
-
-const moduleWrapperFn = tsserver => {
-  if (!process.versions.pnp) {
-    return tsserver;
-  }
-
-  const {isAbsolute} = require(`path`);
-  const pnpApi = require(`pnpapi`);
-
-  const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
-  const isPortal = str => str.startsWith("portal:/");
-  const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
-
-  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
-    return `${locator.name}@${locator.reference}`;
-  }));
-
-  // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
-  // doesn't understand. This layer makes sure to remove the protocol
-  // before forwarding it to TS, and to add it back on all returned paths.
-
-  function toEditorPath(str) {
-    // We add the `zip:` prefix to both `.zip/` paths and virtual paths
-    if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) {
-      // We also take the opportunity to turn virtual paths into physical ones;
-      // this makes it much easier to work with workspaces that list peer
-      // dependencies, since otherwise Ctrl+Click would bring us to the virtual
-      // file instances instead of the real ones.
-      //
-      // We only do this to modules owned by the the dependency tree roots.
-      // This avoids breaking the resolution when jumping inside a vendor
-      // with peer dep (otherwise jumping into react-dom would show resolution
-      // errors on react).
-      //
-      const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
-      if (resolved) {
-        const locator = pnpApi.findPackageLocator(resolved);
-        if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
-          str = resolved;
-        }
-      }
-
-      str = normalize(str);
-
-      if (str.match(/\.zip\//)) {
-        switch (hostInfo) {
-          // Absolute VSCode `Uri.fsPath`s need to start with a slash.
-          // VSCode only adds it automatically for supported schemes,
-          // so we have to do it manually for the `zip` scheme.
-          // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
-          //
-          // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
-          //
-          // 2021-10-08: VSCode changed the format in 1.61.
-          // Before | ^zip:/c:/foo/bar.zip/package.json
-          // After  | ^/zip//c:/foo/bar.zip/package.json
-          //
-          // 2022-04-06: VSCode changed the format in 1.66.
-          // Before | ^/zip//c:/foo/bar.zip/package.json
-          // After  | ^/zip/c:/foo/bar.zip/package.json
-          //
-          // 2022-05-06: VSCode changed the format in 1.68
-          // Before | ^/zip/c:/foo/bar.zip/package.json
-          // After  | ^/zip//c:/foo/bar.zip/package.json
-          //
-          case `vscode <1.61`: {
-            str = `^zip:${str}`;
-          } break;
-
-          case `vscode <1.66`: {
-            str = `^/zip/${str}`;
-          } break;
-
-          case `vscode <1.68`: {
-            str = `^/zip${str}`;
-          } break;
-
-          case `vscode`: {
-            str = `^/zip/${str}`;
-          } break;
-
-          // To make "go to definition" work,
-          // We have to resolve the actual file system path from virtual path
-          // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
-          case `coc-nvim`: {
-            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
-            str = resolve(`zipfile:${str}`);
-          } break;
-
-          // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server)
-          // We have to resolve the actual file system path from virtual path,
-          // everything else is up to neovim
-          case `neovim`: {
-            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
-            str = `zipfile://${str}`;
-          } break;
-
-          default: {
-            str = `zip:${str}`;
-          } break;
-        }
-      } else {
-        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
-      }
-    }
-
-    return str;
-  }
-
-  function fromEditorPath(str) {
-    switch (hostInfo) {
-      case `coc-nvim`: {
-        str = str.replace(/\.zip::/, `.zip/`);
-        // The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
-        // So in order to convert it back, we use .* to match all the thing
-        // before `zipfile:`
-        return process.platform === `win32`
-          ? str.replace(/^.*zipfile:\//, ``)
-          : str.replace(/^.*zipfile:/, ``);
-      } break;
-
-      case `neovim`: {
-        str = str.replace(/\.zip::/, `.zip/`);
-        // The path for neovim is in format of zipfile:///<pwd>/.yarn/...
-        return str.replace(/^zipfile:\/\//, ``);
-      } break;
-
-      case `vscode`:
-      default: {
-        return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
-      } break;
-    }
-  }
-
-  // Force enable 'allowLocalPluginLoads'
-  // TypeScript tries to resolve plugins using a path relative to itself
-  // which doesn't work when using the global cache
-  // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
-  // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
-  // TypeScript already does local loads and if this code is running the user trusts the workspace
-  // https://github.com/microsoft/vscode/issues/45856
-  const ConfiguredProject = tsserver.server.ConfiguredProject;
-  const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
-  ConfiguredProject.prototype.enablePluginsWithOptions = function() {
-    this.projectService.allowLocalPluginLoads = true;
-    return originalEnablePluginsWithOptions.apply(this, arguments);
-  };
-
-  // And here is the point where we hijack the VSCode <-> TS communications
-  // by adding ourselves in the middle. We locate everything that looks
-  // like an absolute path of ours and normalize it.
-
-  const Session = tsserver.server.Session;
-  const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
-  let hostInfo = `unknown`;
-
-  Object.assign(Session.prototype, {
-    onMessage(/** @type {string | object} */ message) {
-      const isStringMessage = typeof message === 'string';
-      const parsedMessage = isStringMessage ? JSON.parse(message) : message;
-
-      if (
-        parsedMessage != null &&
-        typeof parsedMessage === `object` &&
-        parsedMessage.arguments &&
-        typeof parsedMessage.arguments.hostInfo === `string`
-      ) {
-        hostInfo = parsedMessage.arguments.hostInfo;
-        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
-          const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match(
-            // The RegExp from https://semver.org/ but without the caret at the start
-            /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
-          ) ?? []).map(Number)
-
-          if (major === 1) {
-            if (minor < 61) {
-              hostInfo += ` <1.61`;
-            } else if (minor < 66) {
-              hostInfo += ` <1.66`;
-            } else if (minor < 68) {
-              hostInfo += ` <1.68`;
-            }
-          }
-        }
-      }
-
-      const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => {
-        return typeof value === 'string' ? fromEditorPath(value) : value;
-      });
-
-      return originalOnMessage.call(
-        this,
-        isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON)
-      );
-    },
-
-    send(/** @type {any} */ msg) {
-      return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
-        return typeof value === `string` ? toEditorPath(value) : value;
-      })));
-    }
-  });
-
-  return tsserver;
-};
-
-const [major, minor] = absRequire(`typescript/package.json`).version.split(`.`, 2).map(value => parseInt(value, 10));
-// In TypeScript@>=5.5 the tsserver uses the public TypeScript API so that needs to be patched as well.
-// Ref https://github.com/microsoft/TypeScript/pull/55326
-if (major > 5 || (major === 5 && minor >= 5)) {
-  moduleWrapper(absRequire(`typescript`));
-}
-
-// Defer to the real typescript/lib/tsserverlibrary.js your application uses
-module.exports = moduleWrapper(absRequire(`typescript/lib/tsserverlibrary.js`));

.vscode/vscode-java-configs/.yarn/sdks/typescript/lib/typescript.js

@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-
-const {existsSync} = require(`fs`);
-const {createRequire, register} = require(`module`);
-const {resolve} = require(`path`);
-const {pathToFileURL} = require(`url`);
-
-const relPnpApiPath = "../../../../.pnp.cjs";
-
-const absPnpApiPath = resolve(__dirname, relPnpApiPath);
-const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
-const absRequire = createRequire(absPnpApiPath);
-
-const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
-const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
-
-if (existsSync(absPnpApiPath)) {
-  if (!process.versions.pnp) {
-    // Setup the environment to be able to require typescript
-    require(absPnpApiPath).setup();
-    if (isPnpLoaderEnabled && register) {
-      register(pathToFileURL(absPnpLoaderPath));
-    }
-  }
-}
-
-const wrapWithUserWrapper = existsSync(absUserWrapperPath)
-  ? exports => absRequire(absUserWrapperPath)(exports)
-  : exports => exports;
-
-// Defer to the real typescript your application uses
-module.exports = wrapWithUserWrapper(absRequire(`typescript`));

.vscode/vscode-java-configs/.yarn/sdks/typescript/package.json

@@ -1,10 +0,0 @@
-{
-  "name": "typescript",
-  "version": "5.8.3-sdk",
-  "main": "./lib/typescript.js",
-  "type": "commonjs",
-  "bin": {
-    "tsc": "./bin/tsc",
-    "tsserver": "./bin/tsserver"
-  }
-}

.vscode/vscode-java-configs/README.md

@@ -1,7 +0,0 @@
-# vscode-java-configs
-
-
-## FAQ
-
-### Typescript Server crashed 5 times
-  - Open `.pnp.cjs` and replace `bestCandidate.apiPaths.length === 1` with `bestCandidate.apiPaths.length > 0`

.vscode/vscode-java-configs/javaConfig.json

@@ -1,3 +0,0 @@
-{
-  "targetPlatform": "./org.jkiss.cloudbeaver.tp.target"
-}

.vscode/vscode-java-configs/org.jkiss.cloudbeaver.tp.target

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="org.jkiss.cloudbeaver.tp">
-	<locations>
-		<location path="../../../dbeaver-workspace/dependencies/plugins" type="Directory"/>
-	</locations>
-</target>

.vscode/vscode-java-configs/package.json

@@ -1,7 +0,0 @@
-{
-  "name": "vscode-java-configs",
-  "packageManager": "yarn@4.9.2",
-  "devDependencies": {
-    "typescript": "^5.8.3"
-  }
-}

.vscode/vscode-java-configs/yarn.lock

@@ -1,34 +0,0 @@
-# This file is generated by running "yarn install" inside your project.
-# Manual changes might be lost - proceed with caution!
-
-__metadata:
-  version: 8
-  cacheKey: 10c0
-
-"typescript@npm:^5.8.3":
-  version: 5.8.3
-  resolution: "typescript@npm:5.8.3"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 10c0/5f8bb01196e542e64d44db3d16ee0e4063ce4f3e3966df6005f2588e86d91c03e1fb131c2581baf0fb65ee79669eea6e161cd448178986587e9f6844446dbb48
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@npm%3A^5.8.3#optional!builtin<compat/typescript>":
-  version: 5.8.3
-  resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin<compat/typescript>::version=5.8.3&hash=5786d5"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 10c0/39117e346ff8ebd87ae1510b3a77d5d92dae5a89bde588c747d25da5c146603a99c8ee588c7ef80faaf123d89ed46f6dbd918d534d641083177d5fac38b8a1cb
-  languageName: node
-  linkType: hard
-
-"vscode-java-configs@workspace:.":
-  version: 0.0.0-use.local
-  resolution: "vscode-java-configs@workspace:."
-  dependencies:
-    typescript: "npm:^5.8.3"
-  languageName: unknown
-  linkType: soft

README.md

@@ -1,76 +1,64 @@
-<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/cloudbeaver-logo.png" alt="CloudBeaver logo" align="right" width="250"/>
-
 # CloudBeaver Community
 
-Cloud Database Manager - Community Edition.  
-CloudBeaver is a web server that provides a rich web interface. The server itself is a Java application, and the web part is written in TypeScript and React.  
-It is free to use and open-source (licensed under [Apache 2](https://github.com/dbeaver/cloudbeaver/blob/devel/LICENSE) license).  
-See our [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details. 
+<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/cloudbeaver-logo.png" width="250"/>
 
-<a><img src="https://github.com/dbeaver/cloudbeaver/wiki/images/connection-creation-demo.png" width="400"/></a>
-<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/gis-demo.png" width="400"/>
-<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/data-transfer-demo.png" width="400"/>
-<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/sql-editor-demo.png" width="400"/>
+Cloud Database Manager - Community Edition.  
+CloudBeaver is a web server which provides rich web interface. Server itself is a Java application, web part is written on TypeScript and React.  
+It is free to use and open-source (licensed under [Apache 2](https://github.com/dbeaver/cloudbeaver/blob/devel/LICENSE) license).  
+See out [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details.  
+
+![](https://github.com/dbeaver/cloudbeaver/wiki/images/demo_screenshot_1.png)
 
 ## Run in Docker
 
 - [Official Docker repository](https://hub.docker.com/r/dbeaver/cloudbeaver)
-- [Deployment instructions](https://github.com/dbeaver/cloudbeaver/wiki/CloudBeaver-Deployment)
+- [Running instructions](https://github.com/dbeaver/cloudbeaver/wiki/Run-Docker-Container)
 
 ## Demo server
 
-You can see a live demo of CloudBeaver here: https://demo.cloudbeaver.io  
+You can see live demo of CloudBeaver here: https://demo.cloudbeaver.io  
 
 [Database access instructions](https://github.com/dbeaver/cloudbeaver/wiki/Demo-Server)
 
 ## Changelog
 
-### 25.3.2 2026-01-05
+### CloudBeaver 23.2.0 - 2023-09-04
 
-- The ability to pin columns has been added to the Data Editor, allowing users to keep key columns (e.g., IDs, names) visible while scrolling through wide tables;
-- Added a new setting in the SQL Editor to highlight spaces, tabs, and other whitespace characters to help users read, debug, and maintain their scripts. It is turned off by default and can be configured in personal preferences;
-- Redesigned the connection configuration page. Form fields and sections have been reorganized to provide more space for input and reduce visual clutter;
-- Clickhouse: driver has been updated to version 0.9.5;
-- Oracle: Added a new "Set Username to OS_USER" option in the Misc section of Oracle connection settings. When turned on, the tool automatically uses the current database username as the operating system user identifier in the session metadata.
+Changes since 23.1.0
 
-### 25.3.1 2025-12-22
+- Performance:
+   - Pagination has been added to the Navigation tree and metadata viewer, allowing working with more than 1000 database items;
+- Access Management:
+   - Access permissions can be specified for pre-configured connections via the configuration file;
+   - Reverse Proxy authentication now includes the option to provide users' First name and Last name;
+- Authorization:
+   - The SSL option is now available for establishing connections in MySQL, PostgreSQL, Clickhouse;
+- Connections:
+   - Connections are consistently displayed now when they are pre-configured into the workspace in the Global Configuration json file
+- Navigation tree:
+   - The filters for the Navigation tree now allow hiding and showing schemas within the interface.
+   - The search request considers file names and excludes the .sql file extension for now;
+- Data Editor:
+   - The ability to rearrange columns in the Data Editor has been added;
+   - The ability to use custom functions in the Grouping panel has been added;
+- Administration:
+   - New Settings panel displays the product configuration settings such as Minimum fetch size, Maximum fetch size, and Default fetch size from the Data Editor;
+   - "Connection Management" tab has been renamed to "Connection Templates" - now only connection templates are displayed;
+- SQL Editor:
+   - Users can simultaneously edit resources for now, allowing them to work together;
+   - Support for displaying tables with nested arrays of objects has been added;
+   - The ability to compress export files allowed to increase in download speed, especially for larger files;
+   - UX in the search bar has been improved  - users can delete a query or request by clicking on the cross icon;
+- Driver management:
+   - Custom settings have been added to the interface for the following dialogue connections: SQLite, DB2, SQL Server, MySQL, Oracle and PostgreSQL;
+   - Trino driver has been updated;
+- Security:
+   - Password autofill functionality was removed;
+   - The "eye" icon for password fields has been removed - the passwords entered into fields will not be displayed in the interface for now;
+- Many small bug fixes, enhancements, and improvements have been made
 
-- Implemented an ability to add parameters and variables to queries in the SQL Editor. This feature allows for the reuse of queries by changing parameters at the execution stage. It is enabled by default and can be configured in personal preferences;
-- Added support for mapping users to CloudBeaver teams based on LDAP memberOf group membership;
-- Added support for previous browser versions, but not older than three years.
 
-### 25.3.0 2025-12-01
+### Old CloudBeaver releases
 
-### Changes since 25.2.0:
+You can find information about earlier releases on the CloudBeaver wiki https://github.com/dbeaver/cloudbeaver/wiki/Releases.
 
-  - Administration:
-    - Permission configuration for connections has been simplified, providing a clearer appearance and improved performance;
-    - LDAP authentication now supports case-insensitive Distinguished Names (DNs), allowing login with mixed-case DNS.
-  - Security:
-    - Fixed a security issue in the Spatial Viewer for the HTML content to prevent a third-party script execution;
-    - Fixed the critical vulnerability (CVE-2025-61927) in the Happy DOM library. The library was updated to version 20.0.2.
-  - SQL Editor:
-    - A confirmation prompt has been added to the SQL Editor to prevent accidental execution of potentially dangerous queries. You can customize this behavior in Preferences > SQL Editor;
-    - A search field has been added to the catalog/schema selector on the main toolbar for easy navigation;
-    - Alphabetical order has been added to the autocomplete values in the SQL Editor to simplify object search;
-    - Added support for temporary tables in semantic analysis.
-  - Data Editor:
-    - The ability to review the database query after applying filters and sorting in the Data Editor, Grouping panel, and Result sets has been added. The new Show SQL button is placed on the Filter panel;
-    - The value panel in the Data Editor has been redesigned to give users more space for viewing and editing data. Tab buttons for different data type visualizations are now aligned on a single level, creating a cleaner layout;
-    - Added visualization for column reordering in the Data Editor;
-    - Fixed an issue in the Data Editor where resizing one column in a wide table caused previously resized columns to revert to their original width. Users can resize multiple columns as intended.
-  - General:
-    - A reorder tabs option has been added to the application, allowing users to set editor tabs in custom positions;
-    - Keyboard navigation has been improved across the application. Additional shortcuts are available in the main info panel (top-right corner) to help discover them faster. Relevant keyboard shortcuts are also shown in the tooltips of Data Editor buttons;
-    - Boolean values have been replaced with intuitive checkboxes instead of the true/false text in the metadata editor, making editing easier and faster;
-    - The database navigator now automatically hides empty subfolders in shared projects, reducing visual clutter;
-  - Databases and drivers:
-    - ClickHouse: query canceling support has been added;
-    - DuckDB: fixed an issue where catalog selection was lost upon disconnection;
-    - PostgreSQL: fixed support for GIS data types;
-    - SQL Server: the driver has been updated to version 13.2.1;
-    - The "Show all databases" setting has been added on the connection page for MySQL and MariaDB.
-## Contribution
-As a community-driven open-source project, we warmly welcome contributions through GitHub pull requests. 
-
-[We are happy to reward](https://dbeaver.com/help-dbeaver/) our most active contributors every major sprint.

SECURITY.md

@@ -9,10 +9,9 @@ currently being supported with security updates.
 | ------- | --------- |
 | 22.x    | yes       |
 | 23.x    | yes       |
-| 24.x    | yes       |
 
 ## Reporting a Vulnerability
 
-Please report (suspected) security vulnerabilities to devops@dbeaver.com.
-You will receive a response from us within 48 hours.
-If the issue is confirmed, we will release a patch as soon as possible, depending on complexity, but historically, within a few days.
+Please report (suspected) security vulnerabilities to devops@dbeaver.com.  
+You will receive a response from us within 48 hours.  
+If the issue is confirmed, we will release a patch as soon as possible depending on complexity but historically within a few days.

apps/h2-query-executor/pom.xml

@@ -17,7 +17,7 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>2.1.214</version>
+            <version>2.2.220</version>
         </dependency>
     </dependencies>
     <build>

apps/h2-query-executor/src/main/java/io/cloudbeaver/ArgsParser.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2023 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/h2-query-executor/src/main/java/io/cloudbeaver/H2ExecutorConsoleApplication.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2023 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/h2-query-executor/src/main/java/io/cloudbeaver/H2QueryExecutor.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2023 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

apps/h2-query-executor/src/main/java/io/cloudbeaver/SqlConsts.java

@@ -1,6 +1,6 @@
 /*
  * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2023 DBeaver Corp and others
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

config/GlobalConfiguration/.dbeaver/data-sources.json

@@ -1,4 +0,0 @@
-{
-  "folders": {},
-  "connections": {}
-}

config/core/cloudbeaver.conf

@@ -1,99 +0,0 @@
-{
-    server: {
-        serverPort: "${CLOUDBEAVER_WEB_SERVER_PORT:8978}",
-        forceHttps: "${CLOUDBEAVER_FORCE_HTTPS:false}",
-
-        contentRoot: "web",
-        driversLocation: "drivers",
-
-        sslConfigurationPath:"${CLOUDBEAVER_SSL_CONF_PATH:workspace/.data/ssl-config.xml}",
-
-        rootURI: "${CLOUDBEAVER_ROOT_URI:/}",
-        serviceURI: "/api/",
-        supportedHosts: [],
-
-        productSettings: {
-            # Global properties
-            core.theming.theme: "${CLOUDBEAVER_CORE_THEMING_THEME:system}",
-            core.localization.language: "${CLOUDBEAVER_CORE_LOCALIZATION:en}",
-            plugin.sql-editor.autoSave: "${CLOUDBEAVER_SQL_EDITOR_AUTOSAVE:true}",
-            plugin.sql-editor.disabled: "${CLOUDBEAVER_SQL_EDITOR_DISABLED:false}",
-            # max size of the file that can be uploaded to the editor (in kilobytes)
-            plugin.sql-editor.maxFileSize: "${CLOUDBEAVER_SQL_EDITOR_MAX_FILE_SIZE:10240}",
-            plugin.log-viewer.disabled: "${CLOUDBEAVER_LOG_VIEWER_DISABLED:false}",
-            plugin.log-viewer.logBatchSize: "${CLOUDBEAVER_LOG_VIEWER_LOG_BATCH_SIZE:1000}",
-            plugin.log-viewer.maxLogRecords: "${CLOUDBEAVER_LOG_VIEWER_MAX_LOG_RECORDS:2000}",
-            sql.proposals.insert.table.alias: "${CLOUDBEAVER_SQL_PROPOSALS_INSERT_TABLE_ALIAS:PLAIN}",
-            SQLEditor.ContentAssistant.experimental.mode: "${CLOUDBEAVER_SQL_EDITOR_CONTENT_ASSISTANT_EXPERIMENTAL_MODE:NEW}"
-        },
-
-        expireSessionAfterPeriod: "${CLOUDBEAVER_EXPIRE_SESSION_AFTER_PERIOD:1800000}",
-        bindSessionToIp: "${CLOUDBEAVER_BIND_SESSION_TO_IP:disable}",
-        develMode: "${CLOUDBEAVER_DEVEL_MODE:false}",
-
-        enableSecurityManager: false,
-
-        sm: {
-            enableBruteForceProtection: "${CLOUDBEAVER_BRUTE_FORCE_PROTECTION_ENABLED:true}",
-            maxFailedLogin: "${CLOUDBEAVER_MAX_FAILED_LOGINS:10}",
-            minimumLoginTimeout: "${CLOUDBEAVER_MINIMUM_LOGIN_TIMEOUT:1}",
-            blockLoginPeriod: "${CLOUDBEAVER_BLOCK_PERIOD:300}",
-            passwordPolicy: {
-                minLength: "${CLOUDBEAVER_POLICY_MIN_LENGTH:8}",
-                requireMixedCase: "${CLOUDBEAVER_POLICY_REQUIRE_MIXED_CASE:true}",
-                minNumberCount: "${CLOUDBEAVER_POLICY_MIN_NUMBER_COUNT:1}",
-                minSymbolCount: "${CLOUDBEAVER_POLICY_MIN_SYMBOL_COUNT:0}"
-            }
-        },
-
-        database: {
-            driver: "${CLOUDBEAVER_DB_DRIVER:h2_embedded_v2}",
-            url: "${CLOUDBEAVER_DB_URL:jdbc:h2:${workspace}/.data/cb.h2v2.dat}",
-            schema: "${CLOUDBEAVER_DB_SCHEMA:''}",
-            user: "${CLOUDBEAVER_DB_USER:''}",
-            password: "${CLOUDBEAVER_DB_PASSWORD:''}",
-            initialDataConfiguration: "${CLOUDBEAVER_DB_INITIAL_DATA:conf/initial-data.conf}",
-            pool: {
-                minIdleConnections: "${CLOUDBEAVER_DB_MIN_IDLE_CONNECTIONS:4}",
-                maxIdleConnections: "${CLOUDBEAVER_DB_MAX_IDLE_CONNECTIONS:10}",
-                maxConnections: "${CLOUDBEAVER_DB_MAX_CONNECTIONS:100}",
-                validationQuery: "${CLOUDBEAVER_DB_VALIDATION_QUERY:SELECT 1}"
-            },
-            backupEnabled: "${CLOUDBEAVER_DB_BACKUP_ENABLED:true}"
-        }
-
-    },
-    app: {
-        anonymousAccessEnabled: "${CLOUDBEAVER_APP_ANONYMOUS_ACCESS_ENABLED:true}",
-        anonymousUserRole: user,
-        defaultUserTeam: "${CLOUDBEAVER_APP_DEFAULT_USER_TEAM:user}",
-        grantConnectionsAccessToAnonymousTeam: "${CLOUDBEAVER_APP_GRANT_CONNECTIONS_ACCESS_TO_ANONYMOUS_TEAM:false}",
-        supportsCustomConnections: "${CLOUDBEAVER_APP_SUPPORTS_CUSTOM_CONNECTIONS:false}",
-        showReadOnlyConnectionInfo: "${CLOUDBEAVER_APP_READ_ONLY_CONNECTION_INFO:false}",
-        systemVariablesResolvingEnabled: "${CLOUDBEAVER_SYSTEM_VARIABLES_RESOLVING_ENABLED:false}",
-
-        forwardProxy: "${CLOUDBEAVER_APP_FORWARD_PROXY:false}",
-
-        publicCredentialsSaveEnabled: "${CLOUDBEAVER_APP_PUBLIC_CREDENTIALS_SAVE_ENABLED:true}",
-        adminCredentialsSaveEnabled: "${CLOUDBEAVER_APP_ADMIN_CREDENTIALS_SAVE_ENABLED:true}",
-
-        resourceManagerEnabled: "${CLOUDBEAVER_APP_RESOURCE_MANAGER_ENABLED:true}",
-
-        resourceQuotas: {
-            resourceManagerFileSizeLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_RESOURCE_MANAGER_FILE_SIZE_LIMIT:500000}",
-            sqlMaxRunningQueries: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_MAX_RUNNING_QUERIES:100}",
-            sqlResultSetRowsLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_RESULT_SET_ROWS_LIMIT:100000}",
-            sqlTextPreviewMaxLength: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_TEXT_PREVIEW_MAX_LENGTH:4096}",
-            sqlBinaryPreviewMaxLength: "${CLOUDBEAVER_RESOURCE_QUOTA_SQL_BINARY_PREVIEW_MAX_LENGTH:261120}"
-        },
-        enabledAuthProviders: [
-            "local"
-        ],
-
-        disabledBetaFeatures: [
-
-        ]
-
-    }
-
-}

config/core/initial-data.conf

@@ -2,14 +2,14 @@
     teams: [
         {
             subjectId: "admin",
-            teamName: "Admin",
+            name: "Admin",
             description: "Administrative access. Has all permissions.",
             permissions: [ "admin" ]
         },
         {
             subjectId: "user",
-            teamName: "User",
-            description: "All users, including anonymous.",
+            name: "User",
+            description: "Standard user",
             permissions: [ ]
         }
     ]

config/core/product.conf

@@ -0,0 +1,34 @@
+// Product configuration. Customized web application behavior
+// It is in JSONC format
+{
+    // Global properties
+    core: {
+        // User defaults
+        user: {
+            defaultTheme: "light",
+            defaultLanguage: "en"
+        },
+        app: {
+            // Log viewer config
+            logViewer: {
+                refreshTimeout: 3000,
+                logBatchSize: 1000,
+                maxLogRecords: 2000,
+                maxFailedRequests: 3
+            }
+        },
+        authentication: {
+            primaryAuthProvider: 'local'
+        }
+    },
+    // Notifications config
+    core_events: {
+        notificationsPool: 5
+    },
+    plugin_data_spreadsheet_new: {
+        hidden: false
+    },
+    plugin_data_export: {
+        disabled: false
+    }
+}

config/sample-databases/DefaultConfiguration/GlobalConfiguration/.dbeaver/data-sources.json

@@ -0,0 +1,24 @@
+{
+	"folders": {},
+	"connections": {
+		"postgresql-template-1": {
+			"provider": "postgresql",
+			"driver": "postgres-jdbc",
+			"name": "PostgreSQL (Template)",
+			"save-password": false,
+			"show-system-objects": false,
+			"read-only": true,
+			"template": true,
+			"configuration": {
+				"host": "localhost",
+				"port": "5432",
+				"database": "postgres",
+				"url": "jdbc:postgresql://localhost:5432/postgres",
+				"type": "dev",
+				"provider-properties": {
+					"@dbeaver-show-non-default-db@": "false"
+				}
+			}
+		}
+	}
+}

config/sample-databases/DefaultConfiguration/cloudbeaver.conf

@@ -0,0 +1,69 @@
+{
+    server: {
+        serverPort: 8978,
+
+        workspaceLocation: "workspace",
+        contentRoot: "web",
+        driversLocation: "drivers",
+
+        rootURI: "/",
+        serviceURI: "/api/",
+
+        productConfiguration: "conf/product.conf",
+
+        expireSessionAfterPeriod: 1800000,
+
+        develMode: false,
+
+        enableSecurityManager: false,
+
+        database: {
+            driver="h2_embedded_v2",
+            url: "jdbc:h2:${workspace}/.data/cb.h2v2.dat",
+            initialDataConfiguration: "conf/initial-data.conf",
+            pool: {
+                minIdleConnections: 4,
+                maxIdleConnections: 10,
+                maxConnections: 100,
+                validationQuery: "SELECT 1"
+            }
+        }
+
+    },
+    app: {
+        anonymousAccessEnabled: true,
+        anonymousUserRole: "user",
+        grantConnectionsAccessToAnonymousTeam: false,
+        supportsCustomConnections: false,
+        showReadOnlyConnectionInfo: false,
+
+        forwardProxy: false,
+
+        publicCredentialsSaveEnabled: true,
+        adminCredentialsSaveEnabled: true,
+
+        resourceManagerEnabled: true,
+
+        resourceQuotas: {
+            dataExportFileSizeLimit: 10000000,
+            resourceManagerFileSizeLimit: 500000,
+            sqlMaxRunningQueries: 100,
+            sqlResultSetRowsLimit: 100000,
+            sqlResultSetMemoryLimit: 2000000,
+            sqlTextPreviewMaxLength: 4096,
+            sqlBinaryPreviewMaxLength: 261120
+        },
+        enabledAuthProviders: [
+            "local"
+        ],
+
+        disabledDrivers: [
+            "sqlite:sqlite_jdbc",
+            "h2:h2_embedded",
+            "h2:h2_embedded_v2",
+            "clickhouse:yandex_clickhouse"
+        ]
+
+    }
+
+}

config/sample-databases/README.md

@@ -0,0 +1,3 @@
+### Sample databases
+
+Provides access to locally deployed SQLite sample database

config/sample-databases/SQLiteConfiguration/GlobalConfiguration/.dbeaver/data-sources.json

@@ -0,0 +1,39 @@
+{
+	"folders": {},
+	"connections": {
+		"sqlite_xerial-sample-database": {
+			"provider": "generic",
+			"driver": "sqlite_jdbc",
+			"name": "SQLite - Chinook (Sample)",
+			"save-password": true,
+			"navigator-show-only-entities": false,
+			"navigator-hide-folders": false,
+			"read-only": false,
+			"template": false,
+			"configuration": {
+				"database": "${application.path}/../samples/db/Chinook.sqlitedb",
+				"type": "dev",
+				"auth-model": "native"
+			}
+		},
+		"postgresql-template-1": {
+			"provider": "postgresql",
+			"driver": "postgres-jdbc",
+			"name": "PostgreSQL (Template)",
+			"save-password": false,
+			"show-system-objects": false,
+			"read-only": true,
+			"template": true,
+			"configuration": {
+				"host": "localhost",
+				"port": "5432",
+				"database": "postgres",
+				"url": "jdbc:postgresql://localhost:5432/postgres",
+				"type": "dev",
+				"provider-properties": {
+					"@dbeaver-show-non-default-db@": "false"
+				}
+			}
+		}
+	}
+}

config/sample-databases/SQLiteConfiguration/GlobalConfiguration/.dbeaver/provided-connections.json

@@ -0,0 +1,4 @@
+{
+	"folders": {},
+	"connections": {}
+}

config/sample-databases/SQLiteConfiguration/cloudbeaver.conf

@@ -0,0 +1,68 @@
+{
+    server: {
+        serverPort: 8978,
+
+        workspaceLocation: "workspace",
+        contentRoot: "web",
+        driversLocation: "drivers",
+
+        rootURI: "/",
+        serviceURI: "/api/",
+
+        productConfiguration: "conf/product.conf",
+
+        expireSessionAfterPeriod: 1800000,
+
+        develMode: false,
+
+        enableSecurityManager: false,
+
+        database: {
+            driver="h2_embedded_v2",
+            url: "jdbc:h2:${workspace}/.data/cb.h2v2.dat",
+            initialDataConfiguration: "conf/initial-data.conf",
+            pool: {
+                minIdleConnections: 4,
+                maxIdleConnections: 10,
+                maxConnections: 100,
+                validationQuery: "SELECT 1"
+            }
+        }
+
+    },
+    app: {
+        anonymousAccessEnabled: true,
+        anonymousUserRole: "user",
+        grantConnectionsAccessToAnonymousTeam: false,
+        supportsCustomConnections: false,
+        showReadOnlyConnectionInfo: false,
+
+        forwardProxy: false,
+
+        publicCredentialsSaveEnabled: true,
+        adminCredentialsSaveEnabled: true,
+
+        resourceManagerEnabled: true,
+
+        resourceQuotas: {
+            dataExportFileSizeLimit: 10000000,
+            resourceManagerFileSizeLimit: 500000,
+            sqlMaxRunningQueries: 100,
+            sqlResultSetRowsLimit: 100000,
+            sqlResultSetMemoryLimit: 2000000,
+            sqlTextPreviewMaxLength: 4096,
+            sqlBinaryPreviewMaxLength: 261120
+        },
+        enabledAuthProviders: [
+            "local"
+        ],
+
+        disabledDrivers: [
+            "h2:h2_embedded",
+            "h2:h2_embedded_v2",
+            "clickhouse:yandex_clickhouse"
+        ]
+
+    }
+
+}

config/sample-databases/db/README

@@ -0,0 +1,6 @@
+   Chinook Database - Version 1.3
+   Script: Chinook_Sqlite.sql
+   Description: Creates and populates the Chinook database.
+   DB Server: Sqlite
+   Author: Luis Rocha
+   License: http://www.codeplex.com/ChinookDatabase/license

deploy/build-backend.sh

@@ -1,45 +0,0 @@
-#!/bin/bash
-set -Eeo pipefail
-set +u
-
-echo "Clone and build Cloudbeaver"
-
-rm -rf ./drivers
-rm -rf ./cloudbeaver
-mkdir ./cloudbeaver
-mkdir ./cloudbeaver/server
-mkdir ./cloudbeaver/conf
-mkdir ./cloudbeaver/workspace
-
-echo "Pull cloudbeaver platform"
-
-cd ../..
-
-echo "Pull dbeaver platform"
-[ ! -d dbeaver ] && git clone --depth 1 https://github.com/dbeaver/dbeaver.git
-[ ! -d dbeaver-common ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-common.git
-[ ! -d dbeaver-jdbc-libsql ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-jdbc-libsql.git
-
-
-cd cloudbeaver/deploy
-
-echo "Build CloudBeaver server"
-
-cd ../server/product/aggregate
-mvn clean verify $MAVEN_COMMON_OPTS -Dheadless-platform
-if [[ "$?" -ne 0 ]] ; then
-  echo 'Could not perform package'; exit $rc
-fi
-cd ../../../deploy
-
-echo "Copy server packages"
-
-cp -rp ../server/product/web-server/target/products/io.cloudbeaver.product/all/all/all/* ./cloudbeaver/server
-cp -p ./scripts/* ./cloudbeaver
-mkdir cloudbeaver/samples
-
-cp -rp  ../config/core/* cloudbeaver/conf
-cp -rp ../config/GlobalConfiguration/.dbeaver/data-sources.json cloudbeaver/conf/initial-data-sources.conf
-mv drivers cloudbeaver
-
-echo "End of backend build"

deploy/build-frontend.sh

@@ -1,31 +0,0 @@
-#!/bin/bash
-set -Eeuo pipefail
-
-echo "Build static content"
-
-mkdir -p ./cloudbeaver/web
-
-cd ../../cloudbeaver/webapp
-
-yarn install --immutable
-cd ./packages/product-default
-yarn run bundle
-
-if [[ "$?" -ne 0 ]] ; then
-  echo 'Application build failed'; exit $rc
-fi
-
-cd ../../
-yarn test
-
-if [[ "$?" -ne 0 ]] ; then
-  echo 'Frontend tests failed'; exit $rc
-fi
-
-cd ../deploy
-
-echo "Copy static content"
-
-cp -rp ../webapp/packages/product-default/lib/* cloudbeaver/web
-
-echo "Cloudbeaver is ready. Run run-cloudbeaver-server.sh in cloudbeaver folder to start the server."

deploy/build-sqlite.bat

@@ -0,0 +1 @@
+@call build.bat ..\config\sample-databases\SQLiteConfiguration ..\config\sample-databases\db

deploy/build-sqlite.sh

@@ -0,0 +1 @@
+./build.sh '../config/sample-databases/SQLiteConfiguration' '../config/sample-databases/db'

deploy/build.bat

@@ -1,6 +1,11 @@
 @echo off
 
 rem command line arguments
+SET CONFIGURATION_PATH=%1
+SET SAMPLE_DATABASE_PATH=%2
+
+IF "%CONFIGURATION_PATH%"=="" SET CONFIGURATION_PATH="..\config\sample-databases\DefaultConfiguration"
+echo "Configuration path=%CONFIGURATION_PATH%"
 
 echo Clone and build Cloudbeaver
 
@@ -19,9 +24,6 @@ cd ..\..
 echo Pull dbeaver platform
 
 IF NOT EXIST dbeaver git clone https://github.com/dbeaver/dbeaver.git
-IF NOT EXIST dbeaver-common git clone https://github.com/dbeaver/dbeaver-common.git
-IF NOT EXIST dbeaver-jdbc-libsql git clone https://github.com/dbeaver/dbeaver-jdbc-libsql.git
-
 cd cloudbeaver\deploy
 
 echo Build cloudbeaver server
@@ -37,41 +39,32 @@ xcopy /E /Q ..\server\product\web-server\target\products\io.cloudbeaver.product\
 copy scripts\* cloudbeaver >NUL
 mkdir cloudbeaver\samples
 
-
+IF NOT "%SAMPLE_DATABASE_PATH%"=="" (
+    mkdir cloudbeaver\samples\db
+    xcopy /E /Q %SAMPLE_DATABASE_PATH% cloudbeaver\samples\db >NUL
+)
 copy ..\config\core\* cloudbeaver\conf >NUL
-copy ..\config\DefaultConfiguration\GlobalConfiguration\.dbeaver\data-sources.json cloudbeaver\conf\initial-data-sources.conf >NUL
+copy %CONFIGURATION_PATH%\GlobalConfiguration\.dbeaver\data-sources.json cloudbeaver\conf\initial-data-sources.conf >NUL
+copy %CONFIGURATION_PATH%\*.conf cloudbeaver\conf >NUL
 
 move drivers cloudbeaver >NUL
 
-echo "Build static content"
+echo Build static content
 
-mkdir .\cloudbeaver\web
+cd ..\
 
-cd ..\webapp
+cd ..\cloudbeaver\webapp
 
 call yarn
-cd .\packages\product-default
-call yarn run bundle
-
-if %ERRORLEVEL% neq 0 (
-    echo 'Application build failed'
-    exit /b %ERRORLEVEL%
-)
-
-cd ..\..\
-call yarn test
-
-if %ERRORLEVEL% neq 0 (
-    echo 'Frontend tests failed'
-    exit /b %ERRORLEVEL%
-)
+call yarn lerna bootstrap
+call yarn lerna run build --no-bail --stream --scope=@cloudbeaver/product-default &::-- -- --env source-map
 
 cd ..\deploy
 
-echo "Copy static content"
+echo Copy static content
 
 xcopy /E /Q ..\webapp\packages\product-default\lib cloudbeaver\web >NUL
 
-echo "Cloudbeaver is ready. Run run-cloudbeaver-server.bat in cloudbeaver folder to start the server."
+echo Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server.
 
 pause

deploy/build.sh

@@ -1,5 +1,71 @@
 #!/bin/bash
 set -Eeuo pipefail
 
-source build-backend.sh 
-source build-frontend.sh
+#command line arguments
+CONFIGURATION_PATH=${1-"../config/sample-databases/DefaultConfiguration"}
+SAMPLE_DATABASE_PATH=${2-""}
+
+echo "Clone and build Cloudbeaver"
+
+rm -rf ./drivers
+rm -rf ./cloudbeaver
+mkdir ./cloudbeaver
+mkdir ./cloudbeaver/server
+mkdir ./cloudbeaver/conf
+mkdir ./cloudbeaver/workspace
+mkdir ./cloudbeaver/web
+
+echo "Pull cloudbeaver platform"
+
+cd ../..
+
+echo "Pull dbeaver platform"
+[ ! -d dbeaver ] && git clone https://github.com/dbeaver/dbeaver.git
+
+cd cloudbeaver/deploy
+
+echo "Build CloudBeaver server"
+
+cd ../server/product/aggregate
+mvn clean verify -U -Dheadless-platform
+if [[ "$?" -ne 0 ]] ; then
+  echo 'Could not perform package'; exit $rc
+fi
+cd ../../../deploy
+
+echo "Copy server packages"
+
+cp -rp ../server/product/web-server/target/products/io.cloudbeaver.product/all/all/all/* ./cloudbeaver/server
+cp -p ./scripts/* ./cloudbeaver
+mkdir cloudbeaver/samples
+
+if [[ ! -z "${SAMPLE_DATABASE_PATH}"  ]]; then
+  mkdir cloudbeaver/samples/db
+  cp -rp "${SAMPLE_DATABASE_PATH}" cloudbeaver/samples/
+fi
+
+cp -rp  ../config/core/* cloudbeaver/conf
+cp -rp "${CONFIGURATION_PATH}"/GlobalConfiguration/.dbeaver/data-sources.json cloudbeaver/conf/initial-data-sources.conf
+cp -p "${CONFIGURATION_PATH}"/*.conf cloudbeaver/conf/
+mv drivers cloudbeaver
+
+echo "Build static content"
+
+cd ../
+
+cd ../cloudbeaver/webapp
+
+yarn
+yarn lerna run bootstrap
+yarn lerna run build --no-bail --stream --scope=@cloudbeaver/product-default #-- -- --env source-map
+if [[ "$?" -ne 0 ]] ; then
+  echo 'Application build failed'; exit $rc
+fi
+
+cd ../deploy
+
+echo "Copy static content"
+
+cp -rp ../webapp/packages/product-default/lib/* cloudbeaver/web
+
+echo "Cloudbeaver is ready. Run run-server.bat in cloudbeaver folder to start the server."

deploy/docker/Dockerfile

@@ -0,0 +1,8 @@
+FROM eclipse-temurin:17.0.4.1_1-jre-focal
+
+COPY cloudbeaver /opt/cloudbeaver
+
+EXPOSE 8978
+RUN find /opt/cloudbeaver -type d -exec chmod 775 {} \;
+WORKDIR /opt/cloudbeaver/
+ENTRYPOINT ["./run-server.sh"]

deploy/docker/base-java/Dockerfile

@@ -1,46 +0,0 @@
-FROM ubuntu:24.04
-
-MAINTAINER DBeaver Corp, devops@dbeaver.com
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN set -eux; \
-    apt-get update && \
-    apt-get dist-upgrade -y --no-install-recommends && \
-    apt-get install -y --no-install-recommends \
-        # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255
-        curl \
-        # java.lang.UnsatisfiedLinkError: libfontmanager.so: libfreetype.so.6: cannot open shared object file: No such file or directory
-        # java.lang.NoClassDefFoundError: Could not initialize class sun.awt.X11FontManager
-        # https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077
-        fontconfig \
-        # utilities for keeping Ubuntu and OpenJDK CA certificates in sync
-        # https://github.com/adoptium/containers/issues/293
-        ca-certificates p11-kit \
-        # jlink --strip-debug on 13+ needs objcopy: https://github.com/docker-library/openjdk/issues/351
-        # Error: java.io.IOException: Cannot run program "objcopy": error=2, No such file or directory
-        binutils \
-        tzdata \
-        # locales ensures proper character encoding and locale-specific behaviors using en_US.UTF-8
-        locales \
-        nano && \
-    echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen; \
-    locale-gen en_US.UTF-8; \
-    rm -rf /var/lib/apt/lists/*
-
-ENV LANG=en_US.UTF-8
-
-ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:21 $JAVA_HOME $JAVA_HOME
-ENV PATH="${JAVA_HOME}/bin:${PATH}"
-
-RUN set -eux; \
-    # https://github.com/docker-library/openjdk/issues/331#issuecomment-498834472
-    find "$JAVA_HOME/lib" -name '*.so' -exec dirname '{}' ';' | sort -u > /etc/ld.so.conf.d/docker-openjdk.conf; \
-    ldconfig; \
-    # https://github.com/docker-library/openjdk/issues/212#issuecomment-420979840
-    # https://openjdk.java.net/jeps/341
-    java -Xshare:dump;
-
-### Patch java security
-COPY java.security* ${JAVA_HOME}/conf/security/java.security

deploy/docker/cloudbeaver-ce/Dockerfile

@@ -1,21 +0,0 @@
-ARG BASE_JAVA_TAG="stable"
-FROM dbeaver/base-java:${BASE_JAVA_TAG}
-
-MAINTAINER DBeaver Corp, devops@dbeaver.com
-
-ENV DBEAVER_GID=8978
-ENV DBEAVER_UID=8978
-
-RUN groupadd -g $DBEAVER_GID dbeaver && \
-    useradd -g $DBEAVER_GID -m -u $DBEAVER_UID -s /bin/bash dbeaver
-
-COPY cloudbeaver /opt/cloudbeaver
-COPY scripts/launch-product.sh /opt/cloudbeaver/launch-product.sh
-
-EXPOSE 8978
-RUN find /opt/cloudbeaver -type d -exec chmod 775 {} \;
-WORKDIR /opt/cloudbeaver/
-
-RUN chmod +x "run-cloudbeaver-server.sh" "/opt/cloudbeaver/launch-product.sh"
-
-ENTRYPOINT ["./launch-product.sh"]

deploy/docker/make-docker-container.sh

@@ -1,3 +1,3 @@
 cd ..
-docker build -t dbeaver/cloudbeaver:dev . --file ./docker/cloudbeaver-ce/Dockerfile
+docker build -t dbeaver/cloudbeaver:dev . --file ./docker/Dockerfile
 

deploy/scripts/cbvr.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-set -Eeo pipefail
-if [[ $# -eq 0 ]] ;
-  then
-    set -- "$@" -help
-fi
-set -- "$@" -cli-mode
-
-source run-cloudbeaver-server.sh "$@"

deploy/scripts/launch-product.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# This script is needed to change ownership and run the application as user dbeaver during the upgrade from version 24.2.0
-
-# Change ownership of the WORKDIR to the dbeaver user and group
-# Variables DBEAVER_<UID|GID> are defined in the Dockerfile and exported to the runtime environment
-# PWD equals WORKDIR value from product Dockerfile
-
-if [ "$(id -u)" -eq 0 ]; then
-    TARGET_USER=${TARGET_USER:-dbeaver}
-    TARGET_UID=${TARGET_UID:-$DBEAVER_UID}
-    TARGET_GID=${TARGET_GID:-$DBEAVER_GID}
-
-    chown -R $DBEAVER_UID:$DBEAVER_GID $PWD/workspace
-    # Execute run-cloudbeaver-server.sh as the dbeaver user with the JAVA_HOME and PATH environment variables
-    exec su "$TARGET_USER" -c "JAVA_HOME=$JAVA_HOME PATH=$PATH ./run-cloudbeaver-server.sh"
-else
-    exec ./run-cloudbeaver-server.sh
-fi

deploy/scripts/run-cloudbeaver-server.bat

@@ -1,47 +0,0 @@
-@echo off
-for /f %%a in ('dir /B /S server\plugins\org.jkiss.dbeaver.launcher*.jar') do SET launcherJar="%%a"
-
-echo "Starting Cloudbeaver Server"
-
-IF NOT EXIST workspace\.metadata (
-    IF NOT EXIST workspace\GlobalConfiguration\.dbeaver (
-        mkdir workspace\GlobalConfiguration\.dbeaver\
-        copy conf\initial-data-sources.conf workspace\GlobalConfiguration\.dbeaver\data-sources.json
-    )
-)
-
-SET VMARGS_OPTS = ""
-If Not Defined JAVA_OPTS (
-    SET VMARGS_OPTS = "-Xmx2048M"
-)
-
-java %JAVA_OPTS% ^
-    -Dfile.encoding=UTF-8 ^
-    --add-modules=ALL-DEFAULT ^
-    --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 ^
-    -jar  %launcherJar% ^
-    -product io.cloudbeaver.product.ce.product ^
-    -data %workspacePath% ^
-    -web-config conf/cloudbeaver.conf ^
-    -nl en ^
-    -registryMultiLanguage

deploy/scripts/run-cloudbeaver-server.sh

@@ -1,41 +0,0 @@
-#!/bin/bash
-
-launcherJar=( server/plugins/org.jkiss.dbeaver.launcher*.jar )
-
-echo "Starting Cloudbeaver Server"
-
-[ ! -d "workspace/.metadata" ] && mkdir -p workspace/.metadata \
-  && mkdir -p workspace/GlobalConfiguration/.dbeaver  \
-  && [ ! -f "workspace/GlobalConfiguration/.dbeaver/data-sources.json" ] \
-  && cp conf/initial-data-sources.conf workspace/GlobalConfiguration/.dbeaver/data-sources.json
-
-exec java ${JAVA_OPTS} \
-  -Dfile.encoding=UTF-8 \
-  --add-modules=ALL-DEFAULT \
-  --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 \
-  -jar ${launcherJar} \
-  -product io.cloudbeaver.product.ce.product \
-  -web-config conf/cloudbeaver.conf \
-  "$@" \
-  -nl en \
-  -registryMultiLanguage

deploy/scripts/run-server.bat

@@ -0,0 +1,13 @@
+@echo off
+for /f %%a in ('dir /B /S server\plugins\org.eclipse.equinox.launcher*.jar') do SET launcherJar="%%a"
+
+echo "Starting Cloudbeaver Server"
+
+IF NOT EXIST workspace\.metadata (
+    IF NOT EXIST workspace\GlobalConfiguration\.dbeaver (
+        mkdir workspace\GlobalConfiguration\.dbeaver\
+        copy conf\initial-data-sources.conf workspace\GlobalConfiguration\.dbeaver\data-sources.json
+    )
+)
+
+java %JAVA_OPTS% --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 -jar  %launcherJar% -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage

deploy/scripts/run-server.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+launcherJar=( server/plugins/org.eclipse.equinox.launcher*.jar )
+
+echo "Starting Cloudbeaver Server"
+
+[ ! -d "workspace/.metadata" ] && mkdir -p workspace/.metadata && mkdir -p workspace/GlobalConfiguration/.dbeaver && [ ! -f "workspace/GlobalConfiguration/.dbeaver/data-sources.json" ] && cp conf/initial-data-sources.conf workspace/GlobalConfiguration/.dbeaver/data-sources.json
+
+java ${JAVA_OPTS} --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 -jar  ${launcherJar} -product io.cloudbeaver.product.ce.product -web-config conf/cloudbeaver.conf -nl en -registryMultiLanguage

deploy/supervisor/cloudbeaver.conf

@@ -0,0 +1,10 @@
+[program:cloudbeaver]
+directory=/opt/cloudbeaver/
+command=/opt/cloudbeaver/run-server.sh
+stopasgroup=true
+killasgroup=true
+stopsignal=INT
+autostart=true
+autorestart=true
+redirect_stderr=true
+stdout_logfile=/var/log/cloudbeaver-server.log

generate_workspace.cmd

@@ -1,2 +0,0 @@
-@echo off
-%~dp0\..\idea-rcp-launch-config-generator\runGenerator.cmd -f %~dp0

generate_workspace.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-
-script_dir="$(realpath "$(dirname "$0")")"
-repositories_root_dir="$(realpath "$script_dir/..")"
-
-"$repositories_root_dir"/idea-rcp-launch-config-generator/runGenerator.sh "$script_dir"

javaConfig.json

@@ -0,0 +1,4 @@
+{
+  "projects": ["../dbeaver", "../cloudbeaver/server"],
+  "targetPlatform": "./org.jkiss.cloudbeaver.tp.target"
+}

lefthook.yml

@@ -1,15 +0,0 @@
-lefthook: |
-  cd webapp
-  yarn dlx --quiet lefthook
-output: false
-pre-commit:
-  commands:
-    check-license:
-      skip:
-        - merge
-        - rebase
-      root: webapp
-      glob: "*.{ts,tsx}"
-      exclude:
-        - "**/locales/**"
-      run: yarn core-cli-check-license {staged_files}

org.jkiss.cloudbeaver.tp.target

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="org.jkiss.tp.cloudbeaver">
+	<locations>
+		<location path="../eclipse/Eclipse.app/Contents/Eclipse/plugins" type="Directory"/>
+		<location path="../eclipse/eclipse/plugins" type="Directory"/>
+	</locations>
+</target>

osgi-app.properties

@@ -1,37 +0,0 @@
-workspaceName=cloudbeaver-ce
-featuresPaths=\
-  dbeaver/features;\
-  cloudbeaver/server/features;
-bundlesPaths=\
-  dbeaver-common/modules;\
-  dbeaver/plugins;\
-  cloudbeaver/server/bundles;\
-  dbeaver-jdbc-libsql;\
-  cloudbeaver/server/test
-testLibraries=\
-  org.junit;\
-  org.mockito.mockito-core;\
-  junit-jupiter-api;\
-  org.opentest4j;\
-  org.hamcrest.core;\
-  org.hamcrest
-repositories=\
-  https://repo.dbeaver.net/p2/ce/latest/;\
-  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;\
-  cloudbeaver/server/product/web-server-test/CloudbeaverServerUnitTest.product:../../opt/cloudbeaver;
-ideaConfigurationFilesPaths=\
-  dbeaver/.ide/.idea;
-additionalModuleRoots=\
-  opt;
-optionalFeatureRepositories=\
-  dbeaver/product/repositories
-excludeOutputs=\
-  cloudbeaver/webapp/node_modules

project.deps

@@ -1,3 +0,0 @@
-dbeaver-common
-dbeaver-jdbc-libsql
-dbeaver

server/bundles/graphql.config.yml

@@ -1,9 +0,0 @@
-projects:
-  schema:
-    include: ./**/*.graphqls
-schema: "gql.ce"
-extensions:
-  endpoints:
-    Default GraphQL Endpoint:
-      url: http://localhost:8080/api/gql
-      introspect: false

server/bundles/io.cloudbeaver.model.cli/META-INF/MANIFEST.MF

@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Vendor: DBeaver Corp
-Bundle-Name: Cloudbeaver Web Model
-Bundle-SymbolicName: io.cloudbeaver.model.cli;singleton:=true
-Bundle-Version: 1.0.2.qualifier
-Bundle-Release-Date: 20260119
-Bundle-RequiredExecutionEnvironment: JavaSE-21
-Bundle-ActivationPolicy: lazy
-Require-Bundle: org.jkiss.dbeaver.model.cli;visibility:=reexport
-Export-Package: io.cloudbeaver.model.cli
-Automatic-Module-Name: io.cloudbeaver.model.cli
-Import-Package: org.slf4j

server/bundles/io.cloudbeaver.model.cli/build.properties

@@ -1,5 +0,0 @@
-source.. = src/
-output.. = target/classes/
-bin.includes = .,\
-    META-INF/,\
-    plugin.xml

server/bundles/io.cloudbeaver.model.cli/plugin.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-
-<plugin>
-
-</plugin>

server/bundles/io.cloudbeaver.model.cli/pom.xml

@@ -1,16 +0,0 @@
-<?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>bundles</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-         <relativePath>../</relativePath>
-    </parent>
-    <artifactId>io.cloudbeaver.model.cli</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
-    <packaging>eclipse-plugin</packaging>
-
-</project>

server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverCommandLine.java

@@ -1,68 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * 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 "AS IS" 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.
- */
-package io.cloudbeaver.model.cli;
-
-import org.jkiss.code.NotNull;
-import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.model.cli.*;
-import org.jkiss.dbeaver.model.cli.model.CommandLineAuthenticator;
-import picocli.CommandLine;
-
-public class CloudBeaverCommandLine extends ApplicationCommandLine<ApplicationInstanceController> {
-    @Nullable
-    private final CommandLineAuthenticator authenticator;
-    private final CloudBeaverMixin mixin;
-
-    public CloudBeaverCommandLine(@Nullable CommandLineAuthenticator authenticator) {
-        super();
-        this.authenticator = authenticator;
-        this.mixin = new CloudBeaverMixin();
-    }
-
-    public CloudBeaverCommandLine(
-        @Nullable CommandLineAuthenticator authenticator,
-        @NotNull CloudBeaverMixin mixin
-    ) {
-        super();
-        this.authenticator = authenticator;
-        this.mixin = mixin;
-    }
-
-    @Override
-    protected CloudBeaverTopLevelCommand createTopLevelCommand(
-        @Nullable ApplicationInstanceController applicationInstanceController,
-        @NotNull CommandLineContext context,
-        @NotNull CLIRunMeta runMeta
-    ) {
-        if (authenticator != null) {
-            context.setContextParameter(CLIConstants.CONTEXT_PARAM_AUTHENTICATOR, authenticator);
-        }
-        return new CloudBeaverTopLevelCommand(applicationInstanceController, context, runMeta);
-    }
-
-    @NotNull
-    @Override
-    protected CommandLine initCommandLine(
-        @Nullable ApplicationInstanceController applicationInstanceController,
-        @NotNull CommandLineContext context,
-        @NotNull CLIRunMeta runMeta
-    ) {
-        var cmd = super.initCommandLine(applicationInstanceController, context, runMeta);
-        cmd.addMixin("cloudbeaver", mixin);
-        return cmd;
-    }
-}

server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverInstanceServer.java

@@ -1,54 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * 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 "AS IS" 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.
- */
-package io.cloudbeaver.model.cli;
-
-
-import org.jkiss.code.NotNull;
-import org.jkiss.dbeaver.model.cli.ApplicationInstanceController;
-import org.jkiss.dbeaver.model.cli.ApplicationInstanceServer;
-import org.jkiss.dbeaver.model.cli.CLIProcessResult;
-
-import java.io.IOException;
-
-public class CloudBeaverInstanceServer extends ApplicationInstanceServer<ApplicationInstanceController> {
-    private final CloudBeaverCommandLine commandLine;
-
-    public CloudBeaverInstanceServer() throws IOException {
-        super(ApplicationInstanceController.class);
-        this.commandLine = new CloudBeaverCommandLine(null);
-    }
-
-    public CloudBeaverInstanceServer(@NotNull CloudBeaverCommandLine commandLine) throws IOException {
-        super(ApplicationInstanceController.class);
-        this.commandLine = commandLine;
-    }
-
-    @NotNull
-    @Override
-    public CLIProcessResult handleCommandLine(@NotNull String[] args) {
-        try {
-            return commandLine.executeCommandLineCommands(
-                this,
-                false,
-                false,
-                args
-            );
-        } catch (Exception e) {
-            return new CLIProcessResult(CLIProcessResult.PostAction.ERROR, "Error executing command: " + e.getMessage());
-        }
-    }
-}

server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverMixin.java

@@ -1,32 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * 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 "AS IS" 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.
- */
-package io.cloudbeaver.model.cli;
-
-import picocli.CommandLine;
-
-/**
- * CloudBeaver specific mixin options
- */
-public class CloudBeaverMixin {
-    @CommandLine.Option(
-        names = {"-web-config"},
-        arity = "1",
-        hidden = true,
-        scope = CommandLine.ScopeType.INHERIT
-    )
-    private String webConfig;
-}

server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudBeaverTopLevelCommand.java

@@ -1,44 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * 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 "AS IS" 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.
- */
-package io.cloudbeaver.model.cli;
-
-import org.jkiss.code.NotNull;
-import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.model.cli.ApplicationInstanceController;
-import org.jkiss.dbeaver.model.cli.CLIRunMeta;
-import org.jkiss.dbeaver.model.cli.CommandLineContext;
-import org.jkiss.dbeaver.model.cli.command.AbstractTopLevelCommand;
-import picocli.CommandLine;
-
-@CommandLine.Command(name = "cbvr", description = "CloudBeaver commands")
-public class CloudBeaverTopLevelCommand extends AbstractTopLevelCommand {
-    @CommandLine.Option(
-        names = {NOSPASH_OPTION},
-        hidden = true,
-        scope = CommandLine.ScopeType.INHERIT
-    )
-    private boolean noSplash;
-
-    protected CloudBeaverTopLevelCommand(
-        @Nullable ApplicationInstanceController controller,
-        @NotNull CommandLineContext context,
-        @NotNull CLIRunMeta meta
-
-    ) {
-        super(controller, context, meta);
-    }
-}

server/bundles/io.cloudbeaver.model.cli/src/io/cloudbeaver/model/cli/CloudbeaverCliConstants.java

@@ -1,21 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2025 DBeaver Corp and others
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * 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 "AS IS" 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.
- */
-package io.cloudbeaver.model.cli;
-
-public interface CloudbeaverCliConstants {
-    String CLI_MODE = "cliMode";
-}

server/bundles/io.cloudbeaver.model/META-INF/MANIFEST.MF

@@ -3,49 +3,40 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Model
 Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
-Bundle-Version: 1.0.93.qualifier
-Bundle-Release-Date: 20260119
-Bundle-RequiredExecutionEnvironment: JavaSE-21
+Bundle-Version: 1.0.37.qualifier
+Bundle-Release-Date: 20230925
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.jkiss.dbeaver.data.gis;visibility:=reexport,
+Bundle-ClassPath: .
+Require-Bundle:  org.jkiss.dbeaver.data.gis;visibility:=reexport,
  org.jkiss.dbeaver.model;visibility:=reexport,
  org.jkiss.dbeaver.model.sm;visibility:=reexport,
  org.jkiss.dbeaver.model.event;visibility:=reexport,
- org.jkiss.dbeaver.model.nio;visibility:=reexport,
  org.jkiss.dbeaver.registry;visibility:=reexport,
  org.jkiss.dbeaver.net.ssh,
- org.jkiss.bundle.graphql;visibility:=reexport,
+ org.jkiss.bundle.graphql.java;visibility:=reexport,
  org.jkiss.bundle.apache.dbcp,
  com.google.gson;visibility:=reexport,
- jakarta.servlet-api;bundle-version:="6.0.0";visibility:=reexport
+ jakarta.servlet-api;visibility:=reexport
 Export-Package: io.cloudbeaver,
  io.cloudbeaver.auth,
  io.cloudbeaver.auth.provider,
- io.cloudbeaver.auth.provider.fa,
  io.cloudbeaver.auth.provider.local,
  io.cloudbeaver.auth.provisioning,
  io.cloudbeaver.websocket,
- io.cloudbeaver.websocket.event.client,
- io.cloudbeaver.websocket.event.task,
  io.cloudbeaver.model,
  io.cloudbeaver.model.app,
- io.cloudbeaver.model.config,
- io.cloudbeaver.model.apilog,
- io.cloudbeaver.model.fs,
- io.cloudbeaver.model.log,
  io.cloudbeaver.model.rm,
  io.cloudbeaver.model.rm.local,
+ io.cloudbeaver.model.rm.lock,
  io.cloudbeaver.model.session,
  io.cloudbeaver.model.user,
- io.cloudbeaver.model.utils,
  io.cloudbeaver.registry,
  io.cloudbeaver.server,
- io.cloudbeaver.server.filters,
  io.cloudbeaver.service,
  io.cloudbeaver.service.admin,
  io.cloudbeaver.service.security,
  io.cloudbeaver.service.sql,
- io.cloudbeaver.test,
  io.cloudbeaver.utils,
  io.cloudbeaver.utils.file
 Automatic-Module-Name: io.cloudbeaver.model

server/bundles/io.cloudbeaver.model/OSGI-INF/l10n/bundle.properties

@@ -1,19 +0,0 @@
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.osInfo.name=OS
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.memoryAvailable.name=Memory available
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.javaVersion.name=Java version
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.javaParameters.name=JVM parameters
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.productName.name=Product name
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.productVersion.name=Product version
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.workspacePath.name=Workspace path
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.installPath.name=Install path
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.deploymentType.name=Deployment type
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbUrl.name=Security manager database URL
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbDriverName.name=Security manager database driver name
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbProductName.name=Security manager database product name
-meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbProductVersion.name=Security manager database product version
-
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Read-only connection
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Auto-commit
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Keep-alive interval (seconds)
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultSchema.name = Default schema
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultCatalog.name = Default catalog

server/bundles/io.cloudbeaver.model/OSGI-INF/l10n/bundle_fr.properties

@@ -1,2 +0,0 @@
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Garder actif (en secondes)
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = Pas de déconnexion automatique

server/bundles/io.cloudbeaver.model/OSGI-INF/l10n/bundle_ru.properties

@@ -1,5 +0,0 @@
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Только для чтения
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Авто-коммит
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Интервал Keep-alive (в секундах)
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultSchema.name = Схема по умолчанию
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultCatalog.name = Каталог по умолчанию

server/bundles/io.cloudbeaver.model/OSGI-INF/l10n/bundle_vi.properties

@@ -1,4 +0,0 @@
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Kết nối chỉ đọc
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Tự động commit
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Giữ kết nối (tính bằng giây)
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = Không tự động ngắt kết nối

server/bundles/io.cloudbeaver.model/OSGI-INF/l10n/bundle_zh.properties

@@ -1,3 +0,0 @@
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = 自动提交
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = 保持连接 (秒)
-meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = 无自动断开连接

server/bundles/io.cloudbeaver.model/build.properties

@@ -2,6 +2,5 @@ source.. = src/
 output.. = target/classes/
 bin.includes = .,\
     META-INF/,\
-    OSGI-INF/,\
     plugin.xml,\
     schema/

server/bundles/io.cloudbeaver.model/plugin.xml

@@ -4,7 +4,6 @@
 <plugin>
     <extension-point id="io.cloudbeaver.service" name="Web services" schema="schema/io.cloudbeaver.service.exsd"/>
     <extension-point id="io.cloudbeaver.feature" name="Web features" schema="schema/io.cloudbeaver.feature.exsd"/>
-    <extension-point id="io.cloudbeaver.server.feature" name="Web server features" schema="schema/io.cloudbeaver.server.feature.exsd"/>
     <extension-point id="io.cloudbeaver.valueSerializer" name="Web value serializers" schema="schema/io.cloudbeaver.valueSerializer.exsd"/>
     <extension-point id="org.jkiss.dbeaver.auth.provider" name="%extension-point.org.jkiss.dbeaver.authProvider.name" schema="schema/org.jkiss.dbeaver.authProvider.exsd"/>
     <extension-point id="io.cloudbeaver.metaParameters" name="Meta parameters" schema="schema/io.cloudbeaver.metaParameters.exsd"/>
@@ -20,32 +19,4 @@
         </metaParameters>
     </extension>
 
-    <extension point="com.dbeaver.secretController">
-        <controller id="void-secret" class="io.cloudbeaver.model.app.VoidSecretController"
-                    label="Default secret controller" description="Default void secret controller"/>
-    </extension>
-
-    <extension point="org.jkiss.dbeaver.ws.event">
-        <event topicId="cb_session_task" id="cb_session_task_info_updated"
-               class="io.cloudbeaver.websocket.event.task.WSSessionTaskInfoEvent"/>
-
-        <event topicId="cb_session_task" id="cb_session_task_confirmation_request"
-               class="io.cloudbeaver.websocket.event.task.WSSessionTaskConfirmationRequestEvent"/>
-        <event topicId="cb_session_task" id="cb_session_task_query_confirmation_request"
-               class="io.cloudbeaver.websocket.event.task.WSSessionTaskQueryConfirmationRequestEvent"/>
-        <event topicId="cb_session_task" id="cb_session_task_query_params_confirmation_request"
-               class="io.cloudbeaver.websocket.event.task.WSSessionTaskQueryParamsConfirmationEvent"/>
-
-        <clientEvent id="cb_client_session_ping" class="io.cloudbeaver.websocket.event.client.WSSessionPingClientEvent"/>
-        <clientEvent id="cb_client_topic_subscribe" class="io.cloudbeaver.websocket.event.client.WSSubscribeOnTopicClientEvent"/>
-        <clientEvent id="cb_client_topic_unsubscribe"
-                     class="io.cloudbeaver.websocket.event.client.WSUnsubscribeFromTopicClientEvent"/>
-        <clientEvent id="cb_client_projects_active"
-                     class="io.cloudbeaver.websocket.event.client.WSUpdateActiveProjectsClientEvent"/>
-        <clientEvent id="cb_client_session_task_confirmation"
-                     class="io.cloudbeaver.websocket.event.client.WSSessionTaskConfirmationEvent"/>
-        <clientEvent id="cb_client_session_task_with_parameters_confirmation"
-                     class="io.cloudbeaver.websocket.event.client.WSSessionTaskWithParametersConfirmationEvent"/>
-    </extension>
-
 </plugin>