devops: revert docker

.devcontainer/devcontainer.json

@@ -0,0 +1,35 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/java
+{
+  "name": "Java",
+  // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+  "image": "mcr.microsoft.com/devcontainers/java:1-17-bookworm",
+
+  "features": {
+    "ghcr.io/devcontainers/features/java:1": {
+      "version": "none",
+      "installMaven": "true",
+      "installGradle": "false"
+    },
+    "ghcr.io/devcontainers/features/github-cli:1": {},
+    "ghcr.io/devcontainers/features/node:1": {}
+  },
+
+  "hostRequirements": {
+    "cpus": 8,
+    "memory": "16gb",
+    "storage": "64gb"
+  }
+
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
+
+  // Use 'postCreateCommand' to run commands after the container is created.
+  // "postCreateCommand": "java -version",
+
+  // Configure tool-specific properties.
+  // "customizations": {},
+
+  // Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+  // "remoteUser": "root"
+}

.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 17
-        uses: actions/setup-java@v4
-        with:
-          distribution: "temurin"
-          java-version: "17"
-          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/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,76 +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:
-      skip_cache:
-        required: false
-        type: string
-
-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: ./webapp
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - run: corepack enable
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "20"
-          cache: yarn
-          cache-dependency-path: webapp/yarn.lock
-
-      - name: restore node_modules
-        uses: actions/cache@v4
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('webapp/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node_modules-
-
-      - name: restore typescript cache
-        uses: actions/cache@v4
-        with:
-          path: "**/packages/*/dist"
-          key: ${{ runner.os }}-dist-${{ hashFiles('webapp/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-dist-
-
-      - name: yarn clean
-        if: env.skip_cache == 'true'
-        run: yarn clear
-
-      - run: yarn install --immutable
-
-      - run: yarn bundle
-        working-directory: ./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-cache.yml

@@ -0,0 +1,76 @@
+name: frontend-cache
+
+on:
+  push:
+    branches: ["devel"]
+    paths:
+      - "webapp/**"
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./webapp
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "18"
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+
+      - name: restore yarn cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: restore node_modules
+        uses: actions/cache@v3
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node_modules-
+
+      - name: restore typescript cache
+        uses: actions/cache@v3
+        with:
+          path: "**/packages/*/dist"
+          key: ${{ runner.os }}-dist-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-dist-
+
+      - name: yarn install
+        uses: borales/actions-yarn@v4
+        with:
+          dir: webapp
+          cmd: install
+
+      - name: yarn lerna bootstrap
+        uses: borales/actions-yarn@v4
+        with:
+          dir: webapp
+          cmd: lerna bootstrap
+
+      - name: build
+        uses: borales/actions-yarn@v4
+        with:
+          dir: webapp/packages/product-default
+          cmd: build # build tyescript source code
+
+      - name: test
+        uses: borales/actions-yarn@v4
+        with:
+          dir: webapp
+          cmd: lerna run test # build packages that have test script

.github/workflows/frontend-cleanup.yaml

@@ -0,0 +1,29 @@
+name: cleanup caches by a branch
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  cleanup:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cleanup
+        run: |
+          gh extension install actions/gh-actions-cache
+
+          echo "Fetching list of cache key"
+          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 )
+
+          ## Setting this to not fail the workflow while deleting cache keys. 
+          set +e
+          echo "Deleting caches..."
+          for cacheKey in $cacheKeysForPR
+          do
+              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
+          done
+          echo "Done"
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          REPO: ${{ github.repository }}
+          BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge

.github/workflows/frontend-lint.yml

@@ -1,45 +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: ./webapp
-        
-    steps:
-      - uses: actions/checkout@v4
-
-      - run: corepack enable
-      - uses: actions/setup-node@v4
-        with:
-          node-version: "20"
-          cache: yarn
-          cache-dependency-path: webapp/yarn.lock
-
-      - name: restore node_modules
-        uses: actions/cache@v4
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-node_modules-${{ hashFiles('webapp/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-node_modules-
-
-      - 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/frontend.yml

@@ -0,0 +1,80 @@
+name: frontend
+
+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:
+
+  # Allows you to reuse workflows by referencing their YAML files
+  workflow_call:
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./webapp
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
+
+      - name: restore yarn cache
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: restore node_modules
+        uses: actions/cache@v3
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.os }}-node_modules-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node_modules-
+
+      - name: restore typescript cache
+        uses: actions/cache@v3
+        with:
+          path: "**/packages/*/dist"
+          key: ${{ runner.os }}-dist-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-dist-
+
+      - name: yarn install
+        uses: borales/actions-yarn@v4
+        with:
+          dir: webapp
+          cmd: install
+
+      - name: yarn lerna bootstrap
+        uses: borales/actions-yarn@v4
+        with:
+          dir: webapp
+          cmd: lerna bootstrap
+
+      - name: build
+        uses: borales/actions-yarn@v4
+        with:
+          dir: webapp/packages/product-default
+          cmd: bundle
+
+      - name: test
+        uses: borales/actions-yarn@v4
+        with:
+          dir: webapp
+          cmd: lerna run test

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

@@ -1,54 +0,0 @@
-name: CI
-
-on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - reopened
-  push:
-    branches: [devel]
-
-concurrency:
-  group: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || 'push-pr-devel' }}
-  cancel-in-progress: true
-
-jobs:
-  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

.github/workflows/validation.yml

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

.gitignore

@@ -26,7 +26,7 @@ dist/
 
 *.iml
 /idea/
-
+.idea/
 
 ## Mac OS
 .DS_Store
@@ -40,10 +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

.vscode/extensions.json

@@ -15,6 +15,7 @@
     "streetsidesoftware.code-spell-checker",
     "streetsidesoftware.code-spell-checker-russian",
     "syler.sass-indented",
+    "VisualStudioExptTeam.intellicode-api-usage-examples",
     "VisualStudioExptTeam.vscodeintellicode",
     "yzhang.markdown-all-in-one",
     "GraphQL.vscode-graphql-syntax",

.vscode/launch.json

@@ -4,73 +4,95 @@
     {
       "type": "chrome",
       "request": "launch",
-      "name": "CloudBeaver CE",
+      "name": "Chrome",
       "url": "http://localhost:8080",
       "webRoot": "${workspaceFolder}/..",
-      "outFiles": [
-        "${workspaceFolder}/../cloudbeaver/packages/**/dist/**/*.{js,jsx}"
-      ],
-      "smartStep": true,
       "sourceMaps": true,
-      "disableNetworkCache": true,
-      "skipFiles": ["<node_internals>/**", "**/node_modules/**"]
+      "sourceMapPathOverrides": {
+        "webpack:///*": "${workspaceFolder}/../*"
+      },
+      "skipFiles": [
+        "<node_internals>/**",
+        "**/node_modules/**",
+        "${workspaceFolder}/webapp/**/node_modules/**/*.js",
+        "${workspaceFolder}/webapp/**/dist/**/*.js"
+      ]
     },
     {
       "type": "java",
-      "name": "CloudBeaver CE Server",
+      "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"
-      ],
-      // "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-SYSTEM",
-        "--add-opens=java.base/java.io=ALL-UNNAMED",
-        "--add-opens=java.base/java.lang=ALL-UNNAMED",
-        "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED",
-        "--add-opens=java.base/java.net=ALL-UNNAMED",
-        "--add-opens=java.base/java.nio=ALL-UNNAMED",
-        "--add-opens=java.base/java.nio.charset=ALL-UNNAMED",
-        "--add-opens=java.base/java.text=ALL-UNNAMED",
-        "--add-opens=java.base/java.time=ALL-UNNAMED",
-        "--add-opens=java.base/java.util=ALL-UNNAMED",
-        "--add-opens=java.base/java.util.concurrent=ALL-UNNAMED",
-        "--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED",
-        "--add-opens=java.base/jdk.internal.vm=ALL-UNNAMED",
-        "--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED",
-        "--add-opens=java.base/sun.nio.ch=ALL-UNNAMED",
-        "--add-opens=java.base/sun.security.ssl=ALL-UNNAMED",
-        "--add-opens=java.base/sun.security.action=ALL-UNNAMED",
-        "--add-opens=java.base/sun.security.util=ALL-UNNAMED",
-        "--add-opens=java.security.jgss/sun.security.jgss=ALL-UNNAMED",
-        "--add-opens=java.security.jgss/sun.security.krb5=ALL-UNNAMED",
-        "--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED",
-        "--add-opens=java.sql/java.sql=ALL-UNNAMED"
-      ]
+      "mainClass": "org.eclipse.equinox.launcher.Main",
+      "windows": {
+        "type": "java",
+        "name": "CloudBeaver CE",
+        "request": "launch",
+        "mainClass": "org.eclipse.equinox.launcher.Main",
+        "classPaths": [
+          "${workspaceFolder}/../eclipse/eclipse/plugins/org.eclipse.equinox.launcher_1.6.600.v20231106-1826.jar"
+        ],
+        "args": [
+          "-product",
+          "io.cloudbeaver.product.ce.product",
+          "-configuration",
+          "file:${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/",
+          "-dev",
+          "file:${workspaceFolder}/../eclipse/workspace/.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",
+        "classPaths": [
+          "${workspaceFolder}/../eclipse/Eclipse.app/Contents/Eclipse/plugins/org.eclipse.equinox.launcher_1.6.600.v20231106-1826.jar"
+        ],
+        "args": [
+          "-product",
+          "io.cloudbeaver.product.ce.product",
+          "-configuration",
+          "file:${workspaceFolder}/../eclipse/workspace/.metadata/.plugins/org.eclipse.pde.core/CloudbeaverServer.product/",
+          "-dev",
+          "file:${workspaceFolder}/../eclipse/workspace/.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

@@ -5,11 +5,13 @@
     "body": [
       "/*",
       " * CloudBeaver - Cloud Database Manager",
-      " * Copyright (C) 2020-2024 DBeaver Corp and others",
+      " * 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

@@ -46,6 +46,6 @@
     "*.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

@@ -17,7 +17,7 @@
       "type": "shell",
       "command": "yarn",
       "group": "test",
-      "args": ["test"]
+      "args": ["lerna", "run", "test", "--no-bail", "--stream", "--"]
     },
     {
       "label": "Run DevServer CE",
@@ -33,32 +33,14 @@
         "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"
+        "command": "./build-sqlite.bat"
       },
       "osx": {
-        "command": "./build.sh"
+        "command": "./build-sqlite.sh"
       },
       "options": {
         "cwd": "${workspaceFolder}/deploy"
@@ -68,45 +50,16 @@
         "isDefault": true
       }
     },
-    {
-      "label": "Run Backend CE",
-      "type": "shell",
-      "windows": {
-        "command": "./run-server.bat"
-      },
-      "osx": {
-        "command": "./run-server.sh"
-      },
-      "options": {
-        "cwd": "${workspaceFolder}/deploy/cloudbeaver"
-      }
-    },
     {
       "label": "Yarn Install",
       "type": "shell",
-      "command": "yarn install",
+      "command": "yarn install; yarn lerna bootstrap",
       "args": [],
       "presentation": {
         "reveal": "silent",
         "close": true,
         "clear": false
       }
-    },
-    {
-      "label": "Update TS references CE",
-      "type": "shell",
-      "command": "yarn run update-ts-references",
-      "options": {
-        "cwd": "${workspaceFolder}/webapp"
-      }
-    },
-    {
-      "label": "Clean CE",
-      "type": "shell",
-      "command": "yarn clean",
-      "options": {
-        "cwd": "${workspaceFolder}/webapp"
-      }
     }
   ],
   "inputs": [

README.md

@@ -1,16 +1,13 @@
-<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/cloudbeaver-logo.png" 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"/>
 
-<img src="https://github.com/dbeaver/cloudbeaver/wiki/images/connection-creation-demo.png" width="400"/>
-<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
 
@@ -19,65 +16,49 @@ See our [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details.
 
 ## 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
 
-### 24.2.3. 2024-10-21
-- Important update:
-  -    Connections Templates feature is declared as obsolete and will be removed in future releases.
-- General:
-  -    Data editor enhancements: Rows with focused cells are specially marked to make it easier to locate a position in large tables;
-  -    DB2i driver has been updated to version 20.0.7;
-  -    The URL mode for PostgreSQL now supports connecting to multiple databases;
-  -    The issue with displaying BLOB data types in DuckDB has been resolved.
+### 23.3.1, 2023-12-25
+- Performance:
+   - Upgraded to Jetty 11, delivering improved performance, enhanced features, and better alignment with the latest Java specifications.
+- Resource management:
+   - Read-only scripts now have a padlock icon.
+- UX improvement:
+   - Added validation for mandatory fields in all forms for creating and editing entities.
+- Driver management:
+   - Apache Derby driver has been removed because of the vulnerability issues.
+- Many small bug fixes, enhancements, and improvements have been made
 
-### 24.2.2. 2024-10-07
-- Schemas were added to the SQL autocompletion for PostgreSQL, H2, and SQL Server;
-- CloudBeaver can now correctly display negative dates for MySQL database;
-- A search option was added for preferences in the Administration part;
-- Keyboard navigation has been enhanced. You can now use the arrow keys to move through navigator tree elements and the tab key to switch between editors tabs;
-- Sample SQLite database was removed.
+### Changes since 23.2.0: 
 
-### 24.2.1. 2024-09-23
-- Chinese localization has been improved (thanks to [cashlifei](https://github.com/cashlifei));
-- Environment variables configuration has been improved - now you can configure more variables on the initial stage of the Docker setup;
-- SQL Server driver has been updated to version 12.8.0.
-
-### 24.2.0. 2024-09-02
-### Changes since 24.1.0:
-- General:
-  -    French language support was added (thanks to [matthieukhl](https://github.com/matthieukhl))
-  -    Added the ability to close editor tabs with the middle mouse button
-  -    Added right-click support to open the context menu in the Metadata Editor
-  -    The list of forbidden characters for naming and renaming resource manager files has been updated, and now it includes the following characters: / : " \ ' <> | ? *
-  -    Application cookies security was improved
-- Authentication:
-  -    Improved LDAP authentication: added the ability to filter users via service account parameters and ability to specify custom unique user identifiers
-- Data Editor:
-  -    Added additional notifications about the restricted operations
-  -    Enhanced IPv6 and DateTime32 data representation for Clickhouse
-  -    Data editing was fixed for DuckDB
+- Security:
+   - Unauthorized access vulnerability was fixed;
+   - All embedded drivers are disabled by default. Administrators can re-enable them in the Server configuration.
+- Access Management:
+   - Administrators have gained the ability to permanently delete users and their data.
+- Authorization:
+   - The SSL option is available for establishing a connection in SQL Server.
+- Connections:
+   - The 'Save credentials' checkbox has been removed from a template creating form as credentials are not stored in templates.
 - SQL Editor:
-  -    SQL Editor auto-completion was enhanced to get column, table, and function names faster
-  -    Fixed the dollar-quoted string parsing in the SQL Editor for PostgreSQL
-  -    Improved display of the long error messages in the SQL Editor and Log viewer
-  -    Changed the save script icon to a floppy disk for better recognition
-  -    Improved application behavior when closing a connection - open editors won't be closed on disconnect
-- Administration:
-  -    Redesigned administration navigation panel - now it is more compact and clear
-  -    Added the ability to change the default commit mode for each connection separately
-  -    Added the ability to configure the server property rootURI parameter (thanks to [arioko](https://github.com/arioko))
-- Databases:
-  -    Added the "Keep alive" setting for Db2 LUW and IMB i, Apache Kyuubi, Clickhouse, Firebird, and Trino
-  -    Updated Firebird driver to version 5.0.4
-  -    DDL generation for Oracle Tablespaces was added (thanks to [pandya09](https://github.com/pandya09))
+   - Support for using custom delimiters has been added in MySQL;
+   - The Output tab has been implemented, which includes warnings, info, and notices generated by the database when executing user queries;
+   - Fixed an issue in the SQL editor where it was impossible to switch the active schema when working with Oracle databases;
+   - Added ability to select shared connections for private scripts;
+   - Private connections can be chosen for shared scripts, but this change won’t be saved to the script file.
+- Data Editor:
+   - Scrollbars have been made theme-independent;
+   - Added the ability to edit binary values in a table;
+   - Added the ability to count the total number of entries in the table.
+- Driver management:
+   - Updated the version of the Clickhouse driver to 0.4.6.
+- Many small bug fixes, enhancements, and improvements have been made
 
-## Contribution
-As a community-driven open-source project, we warmly welcome contributions through GitHub pull requests. 
+### Old CloudBeaver releases
+
+You can find information about earlier releases on the CloudBeaver wiki https://github.com/dbeaver/cloudbeaver/wiki/Releases.
 
-[We are happy to reward](https://dbeaver.com/help-dbeaver/) our most active contributors every major sprint.
-The most significant contribution to our code for the major release 24.2.0 was made by:
-1. [matthieukhl](https://github.com/matthieukhl)

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,104 +0,0 @@
-{
-    server: {
-        serverPort: "${CLOUDBEAVER_SERVICE_PORT:8978}",
-
-        workspaceLocation: "${CLOUDBEAVER_WORKSPACE_LOCATION:workspace}",
-        contentRoot: "web",
-        driversLocation: "drivers",
-
-        sslConfigurationPath:"${CLOUDBEAVER_SSL_CONF_PATH:workspace/.data/ssl-config.xml}",
-
-        rootURI: "${CLOUDBEAVER_ROOT_URI:/}",
-        serviceURI: "/api/",
-
-        productSettings: {
-            # Global properties
-            core.theming.theme: 'light',
-            core.localization.localization: 'en',
-            plugin.sql-editor.autoSave: true,
-            plugin.sql-editor.disabled: false,
-            # max size of the file that can be uploaded to the editor (in kilobytes)
-            plugin.sql-editor.maxFileSize: 10240,
-            plugin.log-viewer.disabled: false,
-            plugin.log-viewer.logBatchSize: 1000,
-            plugin.log-viewer.maxLogRecords: 2000,
-            sql.proposals.insert.table.alias: PLAIN
-        },
-
-        expireSessionAfterPeriod: "${CLOUDBEAVER_EXPIRE_SESSION_AFTER_PERIOD:1800000}",
-
-        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: {
-            dataExportFileSizeLimit: "${CLOUDBEAVER_RESOURCE_QUOTA_DATA_EXPORT_FILE_SIZE_LIMIT:10000000}",
-            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"
-        ],
-
-        disabledDrivers: [
-            "sqlite:sqlite_jdbc",
-            "h2:h2_embedded",
-            "h2:h2_embedded_v2",
-            "clickhouse:yandex_clickhouse"
-        ],
-        disabledBetaFeatures: [
-
-        ]
-
-    }
-
-}

config/core/initial-data.conf

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

config/core/product.conf

@@ -0,0 +1,31 @@
+// 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
+            }
+        }
+    },
+    // Notifications config
+    core_events: {
+        notificationsPool: 20
+    },
+    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,78 @@
+{
+    server: {
+        serverPort: 8978,
+
+        workspaceLocation: "workspace",
+        contentRoot: "web",
+        driversLocation: "drivers",
+
+        sslConfigurationPath:"${CLOUDBEAVER_SSL_CONF_PATH:workspace/.data/ssl-config.xml}",
+
+        rootURI: "/",
+        serviceURI: "/api/",
+
+        productConfiguration: "conf/product.conf",
+
+        expireSessionAfterPeriod: 1800000,
+
+        develMode: 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}"
+        },
+
+        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

@@ -2,6 +2,12 @@
 set -Eeo pipefail
 set +u
 
+# #command line arguments
+# CONFIGURATION_PATH=${1-"../config/sample-databases/DefaultConfiguration"}
+# SAMPLE_DATABASE_PATH=${2-""}
+
+# echo $CONFIGURATION_PATH
+# echo $SAMPLE_DATABASE_PATH
 echo "Clone and build Cloudbeaver"
 
 rm -rf ./drivers
@@ -10,15 +16,14 @@ 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 --depth 1 https://github.com/dbeaver/dbeaver.git
-[ ! -d dbeaver-common ] && git clone --depth 1 https://github.com/dbeaver/dbeaver-common.git
-
+[ ! -d dbeaver ] && git clone https://github.com/dbeaver/dbeaver.git
 
 cd cloudbeaver/deploy
 
@@ -37,8 +42,20 @@ cp -rp ../server/product/web-server/target/products/io.cloudbeaver.product/all/a
 cp -p ./scripts/* ./cloudbeaver
 mkdir cloudbeaver/samples
 
+if [[ -z $SAMPLE_DATABASE_PATH  ]]; then
+  SAMPLE_DATABASE_PATH=""
+else
+  mkdir cloudbeaver/samples/db
+  cp -rp "${SAMPLE_DATABASE_PATH}" cloudbeaver/samples/
+fi
+
+if [[ -z "$CONFIGURATION_PATH" ]]; then
+  CONFIGURATION_PATH="../config/sample-databases/DefaultConfiguration"
+fi
+
 cp -rp  ../config/core/* cloudbeaver/conf
-cp -rp ../config/GlobalConfiguration/.dbeaver/data-sources.json cloudbeaver/conf/initial-data-sources.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 "End of backend build"

deploy/build-frontend.sh

@@ -3,29 +3,19 @@ set -Eeuo pipefail
 
 echo "Build static content"
 
-mkdir ./cloudbeaver/web
-
 cd ../../cloudbeaver/webapp
 
 yarn
-cd ./packages/product-default
-yarn run bundle
-
+yarn lerna run bootstrap
+yarn lerna run bundle --no-bail --stream --scope=@cloudbeaver/product-default #-- -- --env source-map
 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-server.sh in cloudbeaver folder to start the server."
+echo "Cloudbeaver is ready. Run run-server.bat 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,9 @@
+#!/bin/bash
+set -Eeuo pipefail
+
+#command line arguments
+CONFIGURATION_PATH='../config/sample-databases/SQLiteConfiguration'
+SAMPLE_DATABASE_PATH='../config/sample-databases/db'
+
+source build-backend.sh 
+source build-frontend.sh

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,7 +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
 cd cloudbeaver\deploy
 
 echo Build cloudbeaver server
@@ -35,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 bundle --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-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,9 @@
 #!/bin/bash
 set -Eeuo pipefail
 
+#command line arguments
+CONFIGURATION_PATH="../config/sample-databases/DefaultConfiguration"
+SAMPLE_DATABASE_PATH=""
+
 source build-backend.sh 
 source build-frontend.sh

deploy/docker/Dockerfile

@@ -1,12 +1,10 @@
-FROM ubuntu:24.04
+FROM ubuntu:23.04
 
 MAINTAINER DBeaver Corp, devops@dbeaver.com
 
-ENV DEBIAN_FRONTEND=noninteractive
-
 RUN set -eux; \
     apt-get update; \
-    apt-get install -y --no-install-recommends \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
         # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255
         curl \
         wget \
@@ -45,3 +43,10 @@ RUN set -eux; \
 
 ### Patch java security
 COPY java.security* ${JAVA_HOME}/conf/security/java.security
+
+COPY cloudbeaver /opt/cloudbeaver
+
+EXPOSE 8978
+RUN find /opt/cloudbeaver -type d -exec chmod 775 {} \;
+WORKDIR /opt/cloudbeaver/
+ENTRYPOINT ["./run-server.sh"]

deploy/docker/cloudbeaver-ce/Dockerfile

@@ -1,13 +0,0 @@
-FROM dbeaver/base-java
-
-MAINTAINER DBeaver Corp, devops@dbeaver.com
-
-RUN apt-get update; \
-    apt-get upgrade -y; 
-    
-COPY cloudbeaver /opt/cloudbeaver
-
-EXPOSE 8978
-RUN find /opt/cloudbeaver -type d -exec chmod 775 {} \;
-WORKDIR /opt/cloudbeaver/
-ENTRYPOINT ["./run-server.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/run-server.bat

@@ -1,5 +1,5 @@
 @echo off
-for /f %%a in ('dir /B /S server\plugins\org.jkiss.dbeaver.launcher*.jar') do SET launcherJar="%%a"
+for /f %%a in ('dir /B /S server\plugins\org.eclipse.equinox.launcher*.jar') do SET launcherJar="%%a"
 
 echo "Starting Cloudbeaver Server"
 

deploy/scripts/run-server.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-launcherJar=( server/plugins/org.jkiss.dbeaver.launcher*.jar )
+launcherJar=( server/plugins/org.eclipse.equinox.launcher*.jar )
 
 echo "Starting Cloudbeaver Server"
 
@@ -9,7 +9,7 @@ echo "Starting Cloudbeaver Server"
   && [ ! -f "workspace/GlobalConfiguration/.dbeaver/data-sources.json" ] \
   && cp conf/initial-data-sources.conf workspace/GlobalConfiguration/.dbeaver/data-sources.json
 
-exec java ${JAVA_OPTS} \
+java ${JAVA_OPTS} \
   -Dfile.encoding=UTF-8 \
   --add-modules=ALL-SYSTEM \
   --add-opens=java.base/java.io=ALL-UNNAMED \

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,3 +0,0 @@
-SET mypath=%~dp0
-
-.\..\idea-rcp-launch-config-generator\runGenerator.cmd -f %mypath%

generate_workspace.sh

@@ -1 +0,0 @@
-./../idea-rcp-launch-config-generator/runGenerator.sh -f "$PWD"

javaConfig.json

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

org.jkiss.cloudbeaver.tp.target

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

osgi-app.properties

@@ -1,33 +0,0 @@
-workspaceName=cloudbeaver-ce
-featuresPaths=\
-  dbeaver/features;\
-  cloudbeaver/server/features;
-bundlesPaths=\
-  dbeaver-common/modules;\
-  dbeaver/plugins;\
-  cloudbeaver/server/bundles;
-testLibraries=\
-  org.junit;\
-  org.mockito.mockito-core;\
-  junit-jupiter-api;\
-  org.opentest4j
-repositories=\
-  https://p2.dev.dbeaver.com/eclipse-repo/;\
-  https://download.eclipse.org/releases/${eclipse-version}/;
-testBundles=\
-  org.junit;\
-  org.mockito.mockito-core;\
-  junit-jupiter-api;\
-  org.opentest4j
-productsPaths=\
-  dbeaver/product/community/DBeaver.product;\
-  cloudbeaver/server/product/web-server/CloudbeaverServer.product:../../opt/cloudbeaver;
-ideaConfigurationFilesPaths=\
-  dbeaver/.ide/.idea;
-testBundlePaths=\
-  dbeaver/test;\
-  cloudbeaver/server/test;
-additionalModuleRoots=\
-  opt;
-optionalFeatureRepositories=\
-  dbeaver/product/repositories

project.deps

@@ -1,2 +0,0 @@
-dbeaver-common
-dbeaver

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

@@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Model
 Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
-Bundle-Version: 1.0.64.qualifier
-Bundle-Release-Date: 20241104
+Bundle-Version: 1.0.44.qualifier
+Bundle-Release-Date: 20240108
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
@@ -18,19 +18,16 @@ Require-Bundle: org.jkiss.dbeaver.data.gis;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;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.model,
  io.cloudbeaver.model.app,
- io.cloudbeaver.model.config,
  io.cloudbeaver.model.fs,
- io.cloudbeaver.model.log,
  io.cloudbeaver.model.rm,
  io.cloudbeaver.model.rm.local,
  io.cloudbeaver.model.rm.lock,
@@ -43,7 +40,6 @@ Export-Package: io.cloudbeaver,
  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/pom.xml

@@ -10,7 +10,7 @@
          <relativePath>../</relativePath>
     </parent>
     <artifactId>io.cloudbeaver.model</artifactId>
-    <version>1.0.64-SNAPSHOT</version>
+    <version>1.0.44-SNAPSHOT</version>
     <packaging>eclipse-plugin</packaging>
 
 </project>

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/BaseWebProjectImpl.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.
@@ -16,20 +16,23 @@
  */
 package io.cloudbeaver;
 
+import org.eclipse.core.resources.IProject;
 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMSessionContext;
-import org.jkiss.dbeaver.model.impl.app.BaseProjectImpl;
 import org.jkiss.dbeaver.model.rm.RMController;
 import org.jkiss.dbeaver.model.rm.RMControllerProvider;
 import org.jkiss.dbeaver.model.rm.RMProject;
+import org.jkiss.dbeaver.model.rm.RMUtils;
+import org.jkiss.dbeaver.registry.BaseProjectImpl;
 import org.jkiss.utils.CommonUtils;
 import org.jkiss.utils.Pair;
 
 import java.nio.file.Path;
 import java.util.Collection;
 
-public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMControllerProvider {
+public class BaseWebProjectImpl extends BaseProjectImpl implements RMControllerProvider {
 
     @NotNull
     private final RMProject project;
@@ -37,6 +40,7 @@ public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMCo
     @NotNull
     private final Path path;
     @NotNull
+    protected final DataSourceFilter dataSourceFilter;
     private final RMController resourceController;
 
     public BaseWebProjectImpl(
@@ -44,12 +48,13 @@ public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMCo
         @NotNull RMController resourceController,
         @NotNull SMSessionContext sessionContext,
         @NotNull RMProject project,
-        @NotNull Path path
+        @NotNull DataSourceFilter dataSourceFilter
     ) {
         super(workspace, sessionContext);
         this.resourceController = resourceController;
-        this.path = path;
+        this.path = RMUtils.getProjectPath(project);
         this.project = project;
+        this.dataSourceFilter = dataSourceFilter;
     }
 
     @NotNull
@@ -86,6 +91,12 @@ public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMCo
         return path;
     }
 
+    @Nullable
+    @Override
+    public IProject getEclipseProject() {
+        return null;
+    }
+
     @Override
     public boolean isOpen() {
         return true;
@@ -101,6 +112,11 @@ public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMCo
         return false;
     }
 
+    @NotNull
+    public RMProject getRmProject() {
+        return this.project;
+    }
+
     /**
      * Method for Bulk Update of resources properties paths
      *

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWConstants.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.
@@ -22,22 +22,19 @@ import org.jkiss.dbeaver.model.rm.RMConstants;
 /**
  * General constants
  */
-public interface DBWConstants {
+public class DBWConstants {
 
-    String PERMISSION_ADMIN = DBAPermissionRealm.PERMISSION_ADMIN;
+    public static final String PERMISSION_ADMIN = DBAPermissionRealm.PERMISSION_ADMIN;
 
-    String PERMISSION_CONFIGURATION_MANAGER = RMConstants.PERMISSION_CONFIGURATION_MANAGER;
-    String PERMISSION_PRIVATE_PROJECT_ACCESS = "private-project-access";
-    String PERMISSION_SECRET_MANAGER = "secret-manager";
+    public static final String PERMISSION_CONFIGURATION_MANAGER = RMConstants.PERMISSION_CONFIGURATION_MANAGER;
+    public static final String PERMISSION_PRIVATE_PROJECT_ACCESS = "private-project-access";
 
+    public static final String PERMISSION_EDIT_STRUCTURE = "edit-meta";
+    public static final String PERMISSION_EDIT_DATA = "edit-data";
 
-    String PERMISSION_EDIT_STRUCTURE = "edit-meta";
-    String PERMISSION_EDIT_DATA = "edit-data";
+    public static final String STATE_ATTR_SIGN_IN_STATE = "state.signin";
 
-    String STATE_ATTR_SIGN_IN_STATE = "state.signin";
-    String WORK_DATA_FOLDER_NAME = ".work-data";
-
-    enum SignInState {
+    public enum SignInState {
         GLOBAL,
         EMBEDDED
     }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWFeatureSet.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWUserIdentity.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DBWebException.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.
@@ -21,7 +21,7 @@ import graphql.ErrorType;
 import graphql.GraphQLError;
 import graphql.language.SourceLocation;
 import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.model.sql.SQLState;
+import org.jkiss.dbeaver.model.DBPDataSource;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.utils.CommonUtils;
 
@@ -38,7 +38,6 @@ public class DBWebException extends DBException implements GraphQLError {
 
     public static final String ERROR_CODE_SESSION_EXPIRED = "sessionExpired";
     public static final String ERROR_CODE_ACCESS_DENIED = "accessDenied";
-    public static final String ERROR_CODE_SERVER_NOT_INITIALIZED = "serverNotInitialized";
     public static final String ERROR_CODE_LICENSE_DENIED = "licenseRequired";
     public static final String ERROR_CODE_IDENT_REQUIRED = "identRequired";
     public static final String ERROR_CODE_AUTH_REQUIRED = "authRequired";
@@ -66,8 +65,12 @@ public class DBWebException extends DBException implements GraphQLError {
         this.webErrorCode = errorCode;
     }
 
-    public DBWebException(Throwable cause) {
-        super(null, cause);
+    public DBWebException(Throwable cause, DBPDataSource dataSource) {
+        super(cause, dataSource);
+    }
+
+    public DBWebException(String message, Throwable cause, DBPDataSource dataSource) {
+        super(makeMessage(message, cause), cause, dataSource);
     }
 
     public String getWebErrorCode() {
@@ -125,14 +128,14 @@ public class DBWebException extends DBException implements GraphQLError {
             //stString = stString.substring(divPos + 1).trim();
         }
         extensions.put("stackTrace", stString.trim());
-        int errorCode = SQLState.getCodeFromException(this);
+        int errorCode = getErrorCode();
         if (errorCode != ERROR_CODE_NONE) {
             extensions.put("errorCode", errorCode);
         }
         if (!CommonUtils.isEmpty(webErrorCode)) {
             extensions.put("webErrorCode", webErrorCode);
         }
-        String databaseState = SQLState.getStateFromException(this);
+        String databaseState = getDatabaseState();
         if (databaseState != null) {
             extensions.put("databaseState", databaseState);
         }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/DataSourceFilter.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebDataSourceRegistryProxy.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.
@@ -29,7 +29,6 @@ import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.model.connection.DBPDriver;
 import org.jkiss.dbeaver.model.net.DBWNetworkProfile;
-import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.secret.DBSSecretController;
 import org.jkiss.dbeaver.model.struct.DBSObjectFilter;
@@ -52,7 +51,6 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
         this.dataSourceFilter = filter;
     }
 
-    @NotNull
     @Override
     public DBPProject getProject() {
         return dataSourceRegistry.getProject();
@@ -60,7 +58,7 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
 
     @Nullable
     @Override
-    public DBPDataSourceContainer getDataSource(@NotNull String id) {
+    public DBPDataSourceContainer getDataSource(String id) {
         DBPDataSourceContainer dataSource = dataSourceRegistry.getDataSource(id);
         if (dataSource == null || dataSourceFilter != null && !dataSourceFilter.filter(dataSource)) {
             return null;
@@ -70,7 +68,7 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
 
     @Nullable
     @Override
-    public DBPDataSourceContainer getDataSource(@NotNull DBPDataSource dataSource) {
+    public DBPDataSourceContainer getDataSource(DBPDataSource dataSource) {
         if (dataSourceFilter != null && !dataSourceFilter.filter(dataSource.getContainer())) {
             return null;
         }
@@ -109,13 +107,13 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
 
     @NotNull
     @Override
-    public DBPDataSourceContainer createDataSource(@NotNull DBPDriver driver, @NotNull DBPConnectionConfiguration connConfig) {
+    public DBPDataSourceContainer createDataSource(DBPDriver driver, DBPConnectionConfiguration connConfig) {
         return dataSourceRegistry.createDataSource(driver, connConfig);
     }
 
     @NotNull
     @Override
-    public DBPDataSourceContainer createDataSource(@NotNull DBPDataSourceContainer source) {
+    public DBPDataSourceContainer createDataSource(DBPDataSourceContainer source) {
         return dataSourceRegistry.createDataSource(source);
     }
 
@@ -166,20 +164,18 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
         return dataSourceRegistry.getRootFolders();
     }
 
-    @Nullable
     @Override
-    public DBPDataSourceFolder getFolder(@NotNull String path) {
+    public DBPDataSourceFolder getFolder(String path) {
         return dataSourceRegistry.getFolder(path);
     }
 
-    @NotNull
     @Override
-    public DBPDataSourceFolder addFolder(@Nullable DBPDataSourceFolder parent, @NotNull String name) {
+    public DBPDataSourceFolder addFolder(DBPDataSourceFolder parent, String name) {
         return dataSourceRegistry.addFolder(parent, name);
     }
 
     @Override
-    public void removeFolder(@NotNull DBPDataSourceFolder folder, boolean dropContents) {
+    public void removeFolder(DBPDataSourceFolder folder, boolean dropContents) {
         dataSourceRegistry.removeFolder(folder, dropContents);
     }
 
@@ -201,18 +197,18 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
     }
 
     @Override
-    public void updateSavedFilter(@NotNull DBSObjectFilter filter) {
+    public void updateSavedFilter(DBSObjectFilter filter) {
         dataSourceRegistry.updateSavedFilter(filter);
     }
 
     @Override
-    public void removeSavedFilter(@NotNull String filterName) {
+    public void removeSavedFilter(String filterName) {
         dataSourceRegistry.removeSavedFilter(filterName);
     }
 
     @Nullable
     @Override
-    public DBWNetworkProfile getNetworkProfile(@Nullable String source, @NotNull String name) {
+    public DBWNetworkProfile getNetworkProfile(String source, String name) {
         return dataSourceRegistry.getNetworkProfile(source, name);
     }
 
@@ -223,18 +219,18 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
     }
 
     @Override
-    public void updateNetworkProfile(@NotNull DBWNetworkProfile profile) {
+    public void updateNetworkProfile(DBWNetworkProfile profile) {
         dataSourceRegistry.updateNetworkProfile(profile);
     }
 
     @Override
-    public void removeNetworkProfile(@NotNull DBWNetworkProfile profile) {
+    public void removeNetworkProfile(DBWNetworkProfile profile) {
         dataSourceRegistry.removeNetworkProfile(profile);
     }
 
     @Nullable
     @Override
-    public DBAAuthProfile getAuthProfile(@NotNull String id) {
+    public DBAAuthProfile getAuthProfile(String id) {
         return dataSourceRegistry.getAuthProfile(id);
     }
 
@@ -251,17 +247,12 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
     }
 
     @Override
-    public void updateAuthProfile(@NotNull DBAAuthProfile profile) {
+    public void updateAuthProfile(DBAAuthProfile profile) {
         dataSourceRegistry.updateAuthProfile(profile);
     }
 
     @Override
-    public void setAuthProfiles(@NotNull Collection<DBAAuthProfile> profiles) {
-        dataSourceRegistry.setAuthProfiles(profiles);
-    }
-
-    @Override
-    public void removeAuthProfile(@NotNull DBAAuthProfile profile) {
+    public void removeAuthProfile(DBAAuthProfile profile) {
         dataSourceRegistry.removeAuthProfile(profile);
     }
 
@@ -280,7 +271,6 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
         dataSourceRegistry.refreshConfig(dataSourceIds);
     }
 
-    @Nullable
     @Override
     public Throwable getLastError() {
         return dataSourceRegistry.getLastError();
@@ -297,7 +287,7 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
     }
 
     @Override
-    public void notifyDataSourceListeners(@NotNull DBPEvent event) {
+    public void notifyDataSourceListeners(DBPEvent event) {
         dataSourceRegistry.notifyDataSourceListeners(event);
     }
 
@@ -317,18 +307,11 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
         dataSourceRegistry.setAuthCredentialsProvider(authCredentialsProvider);
     }
 
-    @NotNull
     @Override
     public Set<DBPDataSourceFolder> getTemporaryFolders() {
         return dataSourceRegistry.getTemporaryFolders();
     }
 
-    @NotNull
-    @Override
-    public DBPPreferenceStore getPreferenceStore() {
-        return dataSourceRegistry.getPreferenceStore();
-    }
-
     @Override
     public boolean loadDataSources(
         @NotNull List<DBPDataSourceConfigurationStorage> storages,

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebHeadlessSessionProjectImpl.java

@@ -1,38 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 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;
-
-import io.cloudbeaver.model.session.WebHeadlessSession;
-import org.jkiss.code.NotNull;
-import org.jkiss.dbeaver.model.rm.RMProject;
-import org.jkiss.dbeaver.model.rm.RMUtils;
-
-public class WebHeadlessSessionProjectImpl extends WebProjectImpl {
-    public WebHeadlessSessionProjectImpl(
-        @NotNull WebHeadlessSession session,
-        @NotNull RMProject project
-    ) {
-        super(
-            session.getWorkspace(),
-            session.getUserContext().getRmController(),
-            session.getSessionContext(),
-            project,
-            session.getUserContext().getPreferenceStore(),
-            RMUtils.getProjectPath(project)
-        );
-    }
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebPage.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebProjectImpl.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.
@@ -17,39 +17,29 @@
 package io.cloudbeaver;
 
 import org.jkiss.code.NotNull;
-import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMSessionContext;
-import org.jkiss.dbeaver.model.preferences.DBPPreferenceStore;
 import org.jkiss.dbeaver.model.rm.RMController;
 import org.jkiss.dbeaver.model.rm.RMProject;
-import org.jkiss.dbeaver.model.task.DBTTaskManager;
 import org.jkiss.dbeaver.registry.rm.DataSourceRegistryRM;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 
-import java.nio.file.Path;
-
 public abstract class WebProjectImpl extends BaseWebProjectImpl {
     private static final Log log = Log.getLog(WebProjectImpl.class);
-    @NotNull
-    protected final DBPPreferenceStore preferenceStore;
 
     public WebProjectImpl(
         @NotNull DBPWorkspace workspace,
         @NotNull RMController resourceController,
         @NotNull SMSessionContext sessionContext,
         @NotNull RMProject project,
-        @NotNull DBPPreferenceStore preferenceStore,
-        @NotNull Path path
+        @NotNull DataSourceFilter dataSourceFilter
     ) {
-        super(workspace, resourceController, sessionContext, project, path);
-        this.preferenceStore = preferenceStore;
+        super(workspace, resourceController, sessionContext, project, dataSourceFilter);
     }
 
-    @Nullable
     @Override
     public Object getProjectProperty(String propName) {
         try {
@@ -61,7 +51,7 @@ public abstract class WebProjectImpl extends BaseWebProjectImpl {
     }
 
     @Override
-    public void setProjectProperty(@NotNull String propName, @Nullable Object propValue) {
+    public void setProjectProperty(String propName, Object propValue) {
         try {
             getResourceController().setProjectProperty(getId(), propName, propValue);
         } catch (DBException e) {
@@ -74,24 +64,13 @@ public abstract class WebProjectImpl extends BaseWebProjectImpl {
         return DBWorkbench.isDistributed();
     }
 
-    @NotNull
-    @Override
-    public DBTTaskManager getTaskManager() {
-        throw new IllegalStateException("Task manager not supported");
-    }
-
     @NotNull
     @Override
     protected DBPDataSourceRegistry createDataSourceRegistry() {
         return new WebDataSourceRegistryProxy(
-            new DataSourceRegistryRM(this, getResourceController(), preferenceStore),
-            getDataSourceFilter()
+            new DataSourceRegistryRM(this, getResourceController()),
+            dataSourceFilter
         );
     }
 
-    @NotNull
-    public DataSourceFilter getDataSourceFilter() {
-        return (ds) -> true;
-    }
-
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebSessionGlobalProjectImpl.java

@@ -1,118 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 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;
-
-import io.cloudbeaver.model.session.WebSession;
-import org.jkiss.code.NotNull;
-import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.model.DBPDataSourceContainer;
-import org.jkiss.dbeaver.model.DBPEvent;
-import org.jkiss.dbeaver.model.rm.RMProject;
-import org.jkiss.dbeaver.model.security.SMObjectType;
-import org.jkiss.dbeaver.model.security.user.SMObjectPermissions;
-
-import java.util.Collections;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * Global project.
- * Connections there can be not accessible.
- */
-public class WebSessionGlobalProjectImpl extends WebSessionProjectImpl {
-    private static final Log log = Log.getLog(WebSessionGlobalProjectImpl.class);
-    private Set<String> accessibleConnectionIds = Collections.emptySet();
-
-    public WebSessionGlobalProjectImpl(@NotNull WebSession webSession, @NotNull RMProject project) {
-        super(webSession, project);
-    }
-
-    /**
-     * Update info about accessible connections from a database.
-     */
-    public synchronized void refreshAccessibleConnectionIds() {
-        this.accessibleConnectionIds = readAccessibleConnectionIds();
-    }
-
-    @NotNull
-    private Set<String> readAccessibleConnectionIds() {
-        try {
-            return webSession.getSecurityController()
-                .getAllAvailableObjectsPermissions(SMObjectType.datasource)
-                .stream()
-                .map(SMObjectPermissions::getObjectId)
-                .collect(Collectors.toSet());
-        } catch (DBException e) {
-            webSession.addSessionError(e);
-            log.error("Error reading connection grants", e);
-            return Collections.emptySet();
-        }
-    }
-
-    /**
-     * Checks if connection is accessible for current user.
-     */
-    public boolean isDataSourceAccessible(@NotNull DBPDataSourceContainer dataSource) {
-        return dataSource.isExternallyProvided() ||
-            dataSource.isTemporary() ||
-            webSession.hasPermission(DBWConstants.PERMISSION_ADMIN) ||
-            accessibleConnectionIds.contains(dataSource.getId());
-    }
-
-    /**
-     * Adds a connection if it became accessible.
-     * The method is processed when connection permissions were updated.
-     */
-    public synchronized void addAccessibleConnectionToCache(@NotNull String dsId) {
-        if (!getRMProject().isGlobal()) {
-            return;
-        }
-        this.accessibleConnectionIds.add(dsId);
-        var registry = getDataSourceRegistry();
-        var dataSource = registry.getDataSource(dsId);
-        if (dataSource != null) {
-            addConnection(dataSource);
-            // reflect changes is navigator model
-            registry.notifyDataSourceListeners(new DBPEvent(DBPEvent.Action.OBJECT_ADD, dataSource, true));
-        }
-    }
-
-    /**
-     * Removes a connection if it became not accessible.
-     * The method is processed when connection permissions were updated.
-     */
-    public synchronized void removeAccessibleConnectionFromCache(@NotNull String dsId) {
-        if (!getRMProject().isGlobal()) {
-            return;
-        }
-        var registry = getDataSourceRegistry();
-        var dataSource = registry.getDataSource(dsId);
-        if (dataSource != null) {
-            this.accessibleConnectionIds.remove(dsId);
-            removeConnection(dataSource);
-            // reflect changes is navigator model
-            registry.notifyDataSourceListeners(new DBPEvent(DBPEvent.Action.OBJECT_REMOVE, dataSource));
-            dataSource.dispose();
-        }
-    }
-
-    @NotNull
-    public DataSourceFilter getDataSourceFilter() {
-        return this::isDataSourceAccessible;
-    }
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/WebSessionProjectImpl.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.
@@ -16,60 +16,18 @@
  */
 package io.cloudbeaver;
 
-import io.cloudbeaver.model.WebConnectionInfo;
 import io.cloudbeaver.model.session.WebSession;
-import io.cloudbeaver.utils.WebDataSourceUtils;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.model.DBPDataSourceContainer;
-import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
-import org.jkiss.dbeaver.model.app.DBPDataSourceRegistryCache;
 import org.jkiss.dbeaver.model.navigator.DBNModel;
 import org.jkiss.dbeaver.model.rm.RMProject;
-import org.jkiss.dbeaver.model.rm.RMUtils;
-import org.jkiss.dbeaver.model.websocket.event.WSEventType;
-import org.jkiss.dbeaver.registry.DataSourceDescriptor;
-import org.jkiss.dbeaver.runtime.jobs.DisconnectJob;
-
-import java.nio.file.Path;
-import java.util.*;
-import java.util.stream.Collectors;
 
 public class WebSessionProjectImpl extends WebProjectImpl {
-    private static final Log log = Log.getLog(WebSessionProjectImpl.class);
-    protected final WebSession webSession;
-    private final Map<String, WebConnectionInfo> connections = new HashMap<>();
-    private boolean registryIsLoaded = false;
 
-    public WebSessionProjectImpl(
-        @NotNull WebSession webSession,
-        @NotNull RMProject project
-    ) {
-        super(
-            webSession.getWorkspace(),
-            webSession.getRmController(),
-            webSession.getSessionContext(),
-            project,
-            webSession.getUserPreferenceStore(),
-            RMUtils.getProjectPath(project)
-        );
-        this.webSession = webSession;
-    }
+    private final WebSession webSession;
 
-    public WebSessionProjectImpl(
-        @NotNull WebSession webSession,
-        @NotNull RMProject project,
-        @NotNull Path path
-    ) {
-        super(
-            webSession.getWorkspace(),
-            webSession.getRmController(),
-            webSession.getSessionContext(),
-            project,
-            webSession.getUserPreferenceStore(),
-            path
-        );
+    public WebSessionProjectImpl(@NotNull WebSession webSession, @NotNull RMProject project, @NotNull DataSourceFilter dataSourceFilter) {
+        super(webSession.getWorkspace(), webSession.getRmController(), webSession.getSessionContext(), project, dataSourceFilter);
         this.webSession = webSession;
     }
 
@@ -78,156 +36,4 @@ public class WebSessionProjectImpl extends WebProjectImpl {
     public DBNModel getNavigatorModel() {
         return webSession.getNavigatorModel();
     }
-
-    @NotNull
-    @Override
-    protected DBPDataSourceRegistry createDataSourceRegistry() {
-        DBPDataSourceRegistry dataSourceRegistry = super.createDataSourceRegistry();
-        dataSourceRegistry.setAuthCredentialsProvider(webSession);
-        return dataSourceRegistry;
-    }
-
-    private synchronized void addDataSourcesToCache() {
-        if (registryIsLoaded) {
-            return;
-        }
-        getDataSourceRegistry().getDataSources().forEach(this::addConnection);
-        Throwable lastError = getDataSourceRegistry().getLastError();
-        if (lastError != null) {
-            webSession.addSessionError(lastError);
-            log.error("Error refreshing connections from project '" + getId() + "'", lastError);
-        }
-        registryIsLoaded = true;
-    }
-
-    @Override
-    public void dispose() {
-        super.dispose();
-        Map<String, WebConnectionInfo> conCopy;
-        synchronized (this.connections) {
-            conCopy = new HashMap<>(this.connections);
-            this.connections.clear();
-        }
-
-        for (WebConnectionInfo connectionInfo : conCopy.values()) {
-            if (connectionInfo.isConnected()) {
-                new DisconnectJob(connectionInfo.getDataSourceContainer()).schedule();
-            }
-        }
-    }
-
-
-    /**
-     * Returns web connection info from cache (if exists).
-     */
-    @Nullable
-    public WebConnectionInfo findWebConnectionInfo(@NotNull String connectionId) {
-        synchronized (connections) {
-            return connections.get(connectionId);
-        }
-    }
-
-    /**
-     * Returns web connection info from cache, adds it to cache if not present.
-     * Throws exception if connection is not found.
-     */
-    @NotNull
-    public WebConnectionInfo getWebConnectionInfo(@NotNull String connectionId) throws DBWebException {
-        WebConnectionInfo connectionInfo = findWebConnectionInfo(connectionId);
-        if (connectionInfo != null) {
-            return connectionInfo;
-        }
-        DBPDataSourceContainer dataSource = getDataSourceRegistry().getDataSource(connectionId);
-        if (dataSource != null) {
-            return addConnection(dataSource);
-        }
-        throw new DBWebException("Connection '%s' not found".formatted(connectionId));
-    }
-
-    /**
-     * Adds connection to project cache.
-     */
-    @NotNull
-    public synchronized WebConnectionInfo addConnection(@NotNull DBPDataSourceContainer dataSourceContainer) {
-        WebConnectionInfo connection = new WebConnectionInfo(webSession, dataSourceContainer);
-        synchronized (connections) {
-            connections.put(dataSourceContainer.getId(), connection);
-        }
-        return connection;
-    }
-
-    /**
-     * Removes connection from project cache.
-     */
-    public void removeConnection(@NotNull DBPDataSourceContainer dataSourceContainer) {
-        WebConnectionInfo webConnectionInfo = connections.get(dataSourceContainer.getId());
-        if (webConnectionInfo != null) {
-            webConnectionInfo.clearCache();
-            synchronized (connections) {
-                connections.remove(dataSourceContainer.getId());
-            }
-        }
-    }
-
-    /**
-     * Loads connection from registry if they are not loaded.
-     *
-     * @return connections from cache.
-     */
-    public List<WebConnectionInfo> getConnections() {
-        if (!registryIsLoaded) {
-            addDataSourcesToCache();
-            registryIsLoaded = true;
-        }
-        synchronized (connections) {
-            return new ArrayList<>(connections.values());
-        }
-    }
-
-    /**
-     * updates data sources based on event in web session
-     *
-     * @param dataSourceIds list of updated connections
-     * @param type          type of event
-     */
-    public synchronized boolean updateProjectDataSources(@NotNull List<String> dataSourceIds, @NotNull WSEventType type) {
-        var sendDataSourceUpdatedEvent = false;
-        DBPDataSourceRegistry registry = getDataSourceRegistry();
-        // save old connections
-        var oldDataSources = dataSourceIds.stream()
-            .map(registry::getDataSource)
-            .filter(Objects::nonNull)
-            .collect(Collectors.toMap(
-                DBPDataSourceContainer::getId,
-                ds -> new DataSourceDescriptor((DataSourceDescriptor) ds, ds.getRegistry())
-            ));
-        if (type == WSEventType.DATASOURCE_CREATED || type == WSEventType.DATASOURCE_UPDATED) {
-            registry.refreshConfig(dataSourceIds);
-        }
-        for (String dsId : dataSourceIds) {
-            DataSourceDescriptor ds = (DataSourceDescriptor) registry.getDataSource(dsId);
-            if (ds == null) {
-                continue;
-            }
-            switch (type) {
-                case DATASOURCE_CREATED -> {
-                    addConnection(ds);
-                    sendDataSourceUpdatedEvent = true;
-                }
-                case DATASOURCE_UPDATED -> // if settings were changed we need to send event
-                    sendDataSourceUpdatedEvent |= !ds.equalSettings(oldDataSources.get(dsId));
-                case DATASOURCE_DELETED -> {
-                    WebDataSourceUtils.disconnectDataSource(webSession, ds);
-                    if (registry instanceof DBPDataSourceRegistryCache dsrc) {
-                        dsrc.removeDataSourceFromList(ds);
-                    }
-                    removeConnection(ds);
-                    sendDataSourceUpdatedEvent = true;
-                }
-                default -> {
-                }
-            }
-        }
-        return sendDataSourceUpdatedEvent;
-    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/CBAuthConstants.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.
@@ -25,7 +25,6 @@ public interface CBAuthConstants {
     String CB_AUTH_ID_REQUEST_PARAM = "authId";
     String CB_AUTO_LOGIN_REQUEST_PARAM = "autoLogin";
     String CB_REDIRECT_URL_REQUEST_PARAM = "redirectUrl";
-    String CB_FORCE_SESSIONS_LOGOUT = "forceSessionsLogout";
 
     // Default max idle time (10 minutes)
     long MAX_SESSION_IDLE_TIME = 10 * 60 * 1000;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/NoAuthCredentialsProvider.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderAssigner.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderExternal.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAuthProviderFederated.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.
@@ -19,7 +19,6 @@ package io.cloudbeaver.auth;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.model.security.SMAuthProviderCustomConfiguration;
 
 import java.util.Map;
 
@@ -27,18 +26,17 @@ import java.util.Map;
  * Federated auth provider.
  * Provides links to external auth resource
  */
-public interface SMAuthProviderFederated extends SMSignOutLinkProvider {
+public interface SMAuthProviderFederated {
 
+    /**
+     * Returns new identifying credentials which can be used to find/create user in database
+     */
     @NotNull
     String getSignInLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
 
-    @Override
-    default String getUserSignOutLink(
-        @NotNull SMAuthProviderCustomConfiguration providerConfig,
-        @NotNull Map<String, Object> userCredentials
-    ) throws DBException {
-        return getCommonSignOutLink(providerConfig.getId(), providerConfig.getParameters());
-    }
+
+    @NotNull
+    String getSignOutLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
 
     @Nullable
     String getMetadataLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
@@ -46,9 +44,6 @@ public interface SMAuthProviderFederated extends SMSignOutLinkProvider {
     @Nullable
     String getAcsLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
 
-    @Nullable
-    String getEntityIdLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
-
     @Nullable
     default String getRedirectLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException {
         return null;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMAutoAssign.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMBruteForceProtected.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMSignOutLinkProvider.java

@@ -1,37 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 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.auth;
-
-import org.jkiss.code.NotNull;
-import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.model.security.SMAuthProviderCustomConfiguration;
-
-import java.util.Map;
-
-public interface SMSignOutLinkProvider {
-
-    /**
-     * @return a common link for logout, not related with the user context
-     */
-    @NotNull
-    String getCommonSignOutLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
-
-    String getUserSignOutLink(
-        @NotNull SMAuthProviderCustomConfiguration providerConfig,
-        @NotNull Map<String, Object> userCredentials
-    ) throws DBException;
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/SMTokenCredentialProvider.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/provider/AbstractExternalAuthProvider.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/provider/fa/AbstractSessionExternal.java

@@ -1,79 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 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.auth.provider.fa;
-
-import org.jkiss.code.NotNull;
-import org.jkiss.code.Nullable;
-import org.jkiss.dbeaver.model.auth.*;
-
-import java.time.LocalDateTime;
-import java.util.Map;
-
-public abstract class AbstractSessionExternal implements SMSessionExternal {
-
-    @NotNull
-    protected final Map<String, Object> authParameters;
-    @NotNull
-    protected final SMSession parentSession;
-    @NotNull
-    protected final SMAuthSpace space;
-
-    protected AbstractSessionExternal(
-        @NotNull SMSession parentSession,
-        @NotNull SMAuthSpace space,
-        @NotNull Map<String, Object> authParameters
-    ) {
-        this.parentSession = parentSession;
-        this.space = space;
-        this.authParameters = authParameters;
-    }
-
-    @NotNull
-    @Override
-    public SMAuthSpace getSessionSpace() {
-        return space;
-    }
-
-    @NotNull
-    @Override
-    public SMSessionContext getSessionContext() {
-        return this.parentSession.getSessionContext();
-    }
-
-    @Nullable
-    @Override
-    public SMSessionPrincipal getSessionPrincipal() {
-        return parentSession.getSessionPrincipal();
-    }
-
-    @NotNull
-    @Override
-    public LocalDateTime getSessionStart() {
-        return parentSession.getSessionStart();
-    }
-
-    @Override
-    public void close() {
-        // do nothing
-    }
-
-    @Override
-    public Map<String, Object> getAuthParameters() {
-        return authParameters;
-    }
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/provider/local/LocalAuthProviderConstants.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/auth/provisioning/SMProvisioner.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.
@@ -31,8 +31,4 @@ public interface SMProvisioner {
         @NotNull SMAuthProviderCustomConfiguration customConfiguration,
         @NotNull SMProvisioningFilter filter
     ) throws DBException;
-
-    default boolean isAuthRoleProvided(SMAuthProviderCustomConfiguration configuration) {
-        return false;
-    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebAsyncTaskInfo.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebBasicObjectInfo.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionFolderInfo.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionInfo.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.
@@ -24,11 +24,12 @@ import io.cloudbeaver.service.sql.WebDataFormat;
 import io.cloudbeaver.utils.CBModelConstants;
 import io.cloudbeaver.utils.WebAppUtils;
 import io.cloudbeaver.utils.WebCommonUtils;
-import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.model.*;
-import org.jkiss.dbeaver.model.admin.sessions.DBAServerSessionManager;
+import org.jkiss.dbeaver.model.DBConstants;
+import org.jkiss.dbeaver.model.DBPDataSource;
+import org.jkiss.dbeaver.model.DBPDataSourceContainer;
+import org.jkiss.dbeaver.model.DBPDataSourceFolder;
 import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.connection.DBPAuthModelDescriptor;
 import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
@@ -39,7 +40,6 @@ import org.jkiss.dbeaver.model.navigator.DBNBrowseSettings;
 import org.jkiss.dbeaver.model.navigator.DBNDataSource;
 import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
 import org.jkiss.dbeaver.model.preferences.DBPPropertySource;
-import org.jkiss.dbeaver.model.rm.RMConstants;
 import org.jkiss.dbeaver.model.rm.RMProjectPermission;
 import org.jkiss.dbeaver.model.runtime.DBRRunnableParametrized;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
@@ -56,17 +56,6 @@ public class WebConnectionInfo {
 
     private static final Log log = Log.getLog(WebConnectionInfo.class);
     public static final String SECURED_VALUE = "********";
-
-    private static final String FEATURE_HAS_TOOLS = "hasTools";
-    private static final String FEATURE_CONNECTED = "connected";
-    private static final String FEATURE_VIRTUAL = "virtual";
-    private static final String FEATURE_TEMPORARY = "temporary";
-    private static final String FEATURE_READ_ONLY = "readOnly";
-    private static final String FEATURE_PROVIDED = "provided";
-    private static final String FEATURE_MANAGEABLE = "manageable";
-
-    private static final String TOOL_SESSION_MANAGER = "sessionManager";
-    
     private final WebSession session;
     private final DBPDataSourceContainer dataSourceContainer;
     private WebServerError connectError;
@@ -254,25 +243,22 @@ public class WebConnectionInfo {
         List<String> features = new ArrayList<>();
 
         if (dataSourceContainer.isConnected()) {
-            features.add(FEATURE_CONNECTED);
-            if (!getTools().isEmpty()) {
-                features.add(FEATURE_HAS_TOOLS);
-            }
+            features.add("connected");
         }
         if (dataSourceContainer.isHidden()) {
-            features.add(FEATURE_VIRTUAL);
+            features.add("virtual");
         }
         if (dataSourceContainer.isTemporary()) {
-            features.add(FEATURE_TEMPORARY);
+            features.add("temporary");
         }
         if (dataSourceContainer.isConnectionReadOnly()) {
-            features.add(FEATURE_READ_ONLY);
+            features.add("readOnly");
         }
         if (dataSourceContainer.isProvided()) {
-            features.add(FEATURE_PROVIDED);
+            features.add("provided");
         }
         if (dataSourceContainer.isManageable()) {
-            features.add(FEATURE_MANAGEABLE);
+            features.add("manageable");
         }
 
         return features.toArray(new String[0]);
@@ -398,16 +384,6 @@ public class WebConnectionInfo {
         }
     }
 
-    @Property
-    public Map<String, String> getMainPropertyValues() {
-        Map<String, String> mainProperties = new LinkedHashMap<>();
-        mainProperties.put(DBConstants.PROP_HOST, getHost());
-        mainProperties.put(DBConstants.PROP_PORT, getPort());
-        mainProperties.put(DBConstants.PROP_DATABASE, getDatabaseName());
-        mainProperties.put(DBConstants.PROP_SERVER, getServerName());
-        return mainProperties;
-    }
-
     @Property
     public Map<String, String> getProviderProperties() {
         return dataSourceContainer.getConnectionConfiguration().getProviderProperties();
@@ -445,10 +421,10 @@ public class WebConnectionInfo {
 
     private boolean hasProjectPermission(RMProjectPermission projectPermission) {
         DBPProject project = dataSourceContainer.getProject();
-        if (!(project instanceof WebProjectImpl webProject)) {
+        if (!(project instanceof WebProjectImpl)) {
             return false;
         }
-        return SMUtils.hasProjectPermission(session, webProject.getRMProject(), projectPermission);
+        return SMUtils.hasProjectPermission(session, ((WebProjectImpl) project).getRmProject(), projectPermission);
     }
 
     private boolean canViewReadOnlyConnections() {
@@ -467,40 +443,4 @@ public class WebConnectionInfo {
         closeListeners.add(listener);
     }
 
-    @Property
-    public int getKeepAliveInterval() {
-        return dataSourceContainer.getConnectionConfiguration().getKeepAliveInterval();
-    }
-
-    @Property
-    public boolean isAutocommit() {
-        Boolean isAutoCommit = dataSourceContainer.getConnectionConfiguration().getBootstrap().getDefaultAutoCommit();
-        if (isAutoCommit == null) {
-            return true;
-        }
-        return isAutoCommit;
-    }
-
-    @Property
-    public List<WebSecretInfo> getSharedSecrets() throws DBException {
-        return dataSourceContainer.listSharedCredentials()
-            .stream()
-            .map(WebSecretInfo::new)
-            .collect(Collectors.toList());
-    }
-
-    @NotNull
-    @Property
-    public List<String> getTools() {
-        if (!session.hasPermission(RMConstants.PERMISSION_DATABASE_DEVELOPER)) {
-            return List.of();
-        }
-        List<String> tools = new ArrayList<>();
-        // checks inside that datasource is not null in container, and it is adaptable to session manager class
-        if (DBUtils.getAdapter(DBAServerSessionManager.class, dataSourceContainer) != null) {
-            tools.add(TOOL_SESSION_MANAGER);
-        }
-        return tools;
-    }
-
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebConnectionOriginInfo.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebNetworkHandlerConfig.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.
@@ -18,10 +18,14 @@ package io.cloudbeaver.model;
 
 import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
+import org.jkiss.dbeaver.model.net.DBWHandlerDescriptor;
 import org.jkiss.dbeaver.model.net.DBWHandlerType;
 import org.jkiss.dbeaver.model.net.ssh.SSHConstants;
 import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
+import org.jkiss.dbeaver.model.preferences.DBPPropertySource;
+import org.jkiss.dbeaver.model.runtime.VoidProgressMonitor;
 import org.jkiss.dbeaver.registry.RegistryConstants;
+import org.jkiss.dbeaver.runtime.properties.PropertySourceMap;
 import org.jkiss.utils.CommonUtils;
 
 import java.util.LinkedHashMap;

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebNetworkHandlerConfigInput.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebObjectOrigin.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebProjectInfo.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.
@@ -27,6 +27,7 @@ import org.jkiss.dbeaver.model.rm.RMResourceType;
 import org.jkiss.utils.ArrayUtils;
 
 import java.util.ArrayList;
+import java.util.Collections;
 
 public class WebProjectInfo {
     private final WebSession session;
@@ -53,13 +54,11 @@ public class WebProjectInfo {
     }
 
     @Property
-    public boolean isGlobal() {
-        return project.getRMProject().isGlobal();
-    }
+    public boolean isGlobal() { return project.getRmProject().isGlobal(); }
 
     @Property
     public boolean isShared() {
-        return project.getRMProject().isShared();
+        return project.getRmProject().isShared();
     }
 
     @Property
@@ -74,7 +73,7 @@ public class WebProjectInfo {
 
     @Property
     public boolean isCanEditDataSources() {
-        if (project.getRMProject().getType() == RMProjectType.USER && !customPrivateConnectionsEnabled) {
+        if (project.getRmProject().getType() == RMProjectType.USER && !customPrivateConnectionsEnabled) {
             return false;
         }
         return hasDataSourcePermission(RMProjectPermission.DATA_SOURCES_EDIT);
@@ -96,12 +95,12 @@ public class WebProjectInfo {
     }
 
     private boolean hasDataSourcePermission(RMProjectPermission permission) {
-        return SMUtils.hasProjectPermission(session, project.getRMProject(), permission);
+        return SMUtils.hasProjectPermission(session, project.getRmProject(), permission);
     }
 
     @Property
     public RMResourceType[] getResourceTypes() {
-        RMResourceType[] resourceTypes = project.getRMProject().getResourceTypes();
+        RMResourceType[] resourceTypes = project.getRmProject().getResourceTypes();
 
         if(resourceTypes == null) {
             return ArrayUtils.toArray(RMResourceType.class, new ArrayList<>());

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebPropertyInfo.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.
@@ -18,7 +18,6 @@ package io.cloudbeaver.model;
 
 import io.cloudbeaver.model.session.WebSession;
 import org.jkiss.code.NotNull;
-import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.*;
 import org.jkiss.dbeaver.model.connection.DBPDriverConfigurationType;
@@ -28,7 +27,6 @@ import org.jkiss.dbeaver.model.meta.Property;
 import org.jkiss.dbeaver.model.meta.PropertyLength;
 import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
 import org.jkiss.dbeaver.model.preferences.DBPPropertySource;
-import org.jkiss.dbeaver.registry.settings.ProductSettingDescriptor;
 import org.jkiss.dbeaver.runtime.properties.ObjectPropertyDescriptor;
 import org.jkiss.utils.CommonUtils;
 
@@ -244,12 +242,4 @@ public class WebPropertyInfo {
         return CommonUtils.toString(value);
     }
 
-    @Nullable
-    @Property
-    public List<String> getScopes() {
-        if (property instanceof ProductSettingDescriptor productSettingDescriptor) {
-            return productSettingDescriptor.getScopes();
-        }
-        return null;
-    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebSecretInfo.java

@@ -1,38 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 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;
-
-import org.jkiss.dbeaver.model.meta.Property;
-import org.jkiss.dbeaver.model.secret.DBSSecretValue;
-
-public class WebSecretInfo {
-    private final DBSSecretValue secretValue;
-
-    public WebSecretInfo(DBSSecretValue secretValue) {
-        this.secretValue = secretValue;
-    }
-
-    @Property
-    public String getDisplayName() {
-        return secretValue.getDisplayName();
-    }
-
-    @Property
-    public String getSecretId() {
-        return secretValue.getUniqueId();
-    }
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebServerError.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.
@@ -17,8 +17,8 @@
 package io.cloudbeaver.model;
 
 import io.cloudbeaver.DBWebException;
+import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.sql.DBQuotaException;
-import org.jkiss.dbeaver.model.sql.SQLState;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -28,18 +28,22 @@ import java.io.StringWriter;
  */
 public class WebServerError {
 
-    private final String message;
-    private final String stackTrace;
-    private final String errorType;
-    private final String errorCode;
+    private String message;
+    private String stackTrace;
+    private String errorType;
+    private String errorCode;
 
     public WebServerError(Throwable ex) {
         this.message = ex.getMessage();
         StringWriter buf = new StringWriter();
         ex.printStackTrace(new PrintWriter(buf, true));
         this.stackTrace = buf.toString();
-        errorCode = String.valueOf(SQLState.getCodeFromException(ex));
-        errorType = ex instanceof DBQuotaException ? DBWebException.ERROR_CODE_QUOTA_EXCEEDED : null;
+        if (ex instanceof DBException) {
+            errorCode = String.valueOf(((DBException) ex).getErrorCode());
+        }
+        if (ex instanceof DBQuotaException) {
+            errorType = DBWebException.ERROR_CODE_QUOTA_EXCEEDED;
+        }
     }
 
     public String getMessage() {

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/WebServerMessage.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.

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseAuthWebAppConfiguration.java

@@ -0,0 +1,144 @@
+/*
+ * DBeaver - Universal Database Manager
+ * 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.
+ * 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.app;
+
+import com.google.gson.annotations.Expose;
+import io.cloudbeaver.auth.provider.local.LocalAuthProviderConstants;
+import io.cloudbeaver.registry.WebAuthProviderDescriptor;
+import io.cloudbeaver.registry.WebAuthProviderRegistry;
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.security.SMAuthProviderCustomConfiguration;
+import org.jkiss.utils.ArrayUtils;
+
+import java.util.*;
+
+public abstract class BaseAuthWebAppConfiguration extends BaseWebAppConfiguration implements WebAuthConfiguration {
+    private String defaultAuthProvider;
+    private String[] enabledAuthProviders;
+    private final Set<SMAuthProviderCustomConfiguration> authConfigurations;
+    // Legacy auth configs, left for backward compatibility
+    @Expose(serialize = false)
+    private final Map<String, SMAuthProviderCustomConfiguration> authConfiguration;
+
+    public BaseAuthWebAppConfiguration() {
+        super();
+        this.defaultAuthProvider = LocalAuthProviderConstants.PROVIDER_ID;
+        this.enabledAuthProviders = null;
+        this.authConfigurations = new LinkedHashSet<>();
+        this.authConfiguration = new LinkedHashMap<>();
+    }
+
+    public BaseAuthWebAppConfiguration(BaseAuthWebAppConfiguration src) {
+        super(src);
+        this.defaultAuthProvider = src.defaultAuthProvider;
+        this.enabledAuthProviders = src.enabledAuthProviders;
+        this.authConfigurations = new LinkedHashSet<>(src.authConfigurations);
+        this.authConfiguration = new LinkedHashMap<>(src.authConfiguration);
+    }
+
+    @Override
+    public String getDefaultAuthProvider() {
+        return defaultAuthProvider;
+    }
+
+    public void setDefaultAuthProvider(String defaultAuthProvider) {
+        this.defaultAuthProvider = defaultAuthProvider;
+    }
+
+    @Override
+    public String[] getEnabledAuthProviders() {
+        if (enabledAuthProviders == null) {
+            // No config - enable all providers (+backward compatibility)
+            return WebAuthProviderRegistry.getInstance().getAuthProviders()
+                .stream().map(WebAuthProviderDescriptor::getId).toArray(String[]::new);
+        }
+        return enabledAuthProviders;
+    }
+
+    public void setEnabledAuthProviders(String[] enabledAuthProviders) {
+        this.enabledAuthProviders = enabledAuthProviders;
+    }
+
+
+    @Override
+    public boolean isAuthProviderEnabled(String id) {
+        var authProviderDescriptor = WebAuthProviderRegistry.getInstance().getAuthProvider(id);
+        if (authProviderDescriptor == null) {
+            return false;
+        }
+
+        if (!ArrayUtils.contains(getEnabledAuthProviders(), id)) {
+            return false;
+        }
+        if (!ArrayUtils.isEmpty(authProviderDescriptor.getRequiredFeatures())) {
+            for (String rf : authProviderDescriptor.getRequiredFeatures()) {
+                if (!isFeatureEnabled(rf)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    ////////////////////////////////////////////
+    // Auth provider configs
+    @Override
+    public Set<SMAuthProviderCustomConfiguration> getAuthCustomConfigurations() {
+        return authConfigurations;
+    }
+
+    @Override
+    @Nullable
+    public SMAuthProviderCustomConfiguration getAuthProviderConfiguration(@NotNull String id) {
+        synchronized (authConfigurations) {
+            return authConfigurations.stream().filter(c -> c.getId().equals(id)).findAny().orElse(null);
+        }
+    }
+
+    public void addAuthProviderConfiguration(@NotNull SMAuthProviderCustomConfiguration config) {
+        synchronized (authConfigurations) {
+            authConfigurations.removeIf(c -> c.getId().equals(config.getId()));
+            authConfigurations.add(config);
+        }
+    }
+
+    public void setAuthProvidersConfigurations(Collection<SMAuthProviderCustomConfiguration> authProviders) {
+        synchronized (authConfigurations) {
+            authConfigurations.clear();
+            authConfigurations.addAll(authProviders);
+        }
+    }
+
+    public boolean deleteAuthProviderConfiguration(@NotNull String id) {
+        synchronized (authConfigurations) {
+            return authConfigurations.removeIf(c -> c.getId().equals(id));
+        }
+    }
+
+    public void loadLegacyCustomConfigs() {
+        // Convert legacy map of configs into list
+        if (!authConfiguration.isEmpty()) {
+            for (Map.Entry<String, SMAuthProviderCustomConfiguration> entry : authConfiguration.entrySet()) {
+                entry.getValue().setId(entry.getKey());
+                authConfigurations.add(entry.getValue());
+            }
+            authConfiguration.clear();
+        }
+    }
+}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseServerConfigurationController.java

@@ -1,104 +0,0 @@
-/*
- * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 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.app;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import org.jkiss.code.NotNull;
-import org.jkiss.dbeaver.DBException;
-import org.jkiss.dbeaver.Log;
-import org.jkiss.dbeaver.registry.fs.FileSystemProviderRegistry;
-import org.jkiss.utils.IOUtils;
-
-import java.net.URI;
-import java.nio.file.FileSystem;
-import java.nio.file.FileSystems;
-import java.nio.file.Path;
-
-/**
- * Abstract class that contains methods for loading configuration with gson.
- */
-public abstract class BaseServerConfigurationController<T extends WebServerConfiguration>
-    implements WebServerConfigurationController<T> {
-    private static final Log log = Log.getLog(BaseServerConfigurationController.class);
-    @NotNull
-    private final Path homeDirectory;
-
-    protected Path workspacePath;
-
-    protected BaseServerConfigurationController(@NotNull Path homeDirectory) {
-        this.homeDirectory = homeDirectory;
-        //default workspaceLocation
-        this.workspacePath = homeDirectory.resolve("workspace");
-    }
-
-    @NotNull
-    public Gson getGson() {
-        return getGsonBuilder().create();
-    }
-
-    @NotNull
-    protected abstract GsonBuilder getGsonBuilder();
-
-    public abstract T getServerConfiguration();
-
-
-    @NotNull
-    protected synchronized void initWorkspacePath() throws DBException {
-        if (workspacePath != null && !IOUtils.isFileFromDefaultFS(workspacePath)) {
-            log.warn("Workspace directory already initialized: " + workspacePath);
-        }
-        String workspaceLocation = getWorkspaceLocation();
-        URI workspaceUri = URI.create(workspaceLocation);
-        if (workspaceUri.getScheme() == null) {
-            // default filesystem
-            this.workspacePath = getHomeDirectory().resolve(workspaceLocation);
-        } else {
-            var externalFsProvider =
-                FileSystemProviderRegistry.getInstance().getFileSystemProviderBySchema(workspaceUri.getScheme());
-            if (externalFsProvider == null) {
-                throw new DBException("File system not found for scheme: " + workspaceUri.getScheme());
-            }
-            ClassLoader fsClassloader = externalFsProvider.getInstance().getClass().getClassLoader();
-            try (FileSystem externalFileSystem = FileSystems.newFileSystem(workspaceUri,
-                System.getenv(),
-                fsClassloader);) {
-                this.workspacePath = externalFileSystem.provider().getPath(workspaceUri);
-            } catch (Exception e) {
-                throw new DBException("Failed to initialize workspace path: " + workspaceUri, e);
-            }
-        }
-        log.info("Workspace path initialized: " + workspacePath);
-    }
-
-    @NotNull
-    protected abstract String getWorkspaceLocation();
-
-    @NotNull
-    protected Path getHomeDirectory() {
-        return homeDirectory;
-    }
-
-    @NotNull
-    @Override
-    public Path getWorkspacePath() {
-        if (workspacePath == null) {
-            throw new RuntimeException("Workspace path not initialized");
-        }
-        return workspacePath;
-    }
-}

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebAppConfiguration.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.
@@ -29,18 +29,16 @@ public abstract class BaseWebAppConfiguration implements WebAppConfiguration {
     public static final String DEFAULT_APP_ANONYMOUS_TEAM_NAME = "user";
 
     protected final Map<String, Object> plugins;
-    protected String defaultUserTeam = DEFAULT_APP_ANONYMOUS_TEAM_NAME;
+    protected String defaultUserTeam;
     protected boolean resourceManagerEnabled;
     protected boolean showReadOnlyConnectionInfo;
     protected String[] enabledFeatures;
-    protected String[] disabledBetaFeatures;
-
 
     public BaseWebAppConfiguration() {
         this.plugins = new LinkedHashMap<>();
+        this.defaultUserTeam = DEFAULT_APP_ANONYMOUS_TEAM_NAME;
         this.resourceManagerEnabled = true;
         this.enabledFeatures = null;
-        this.disabledBetaFeatures = new String[0];
         this.showReadOnlyConnectionInfo = false;
     }
 
@@ -49,7 +47,6 @@ public abstract class BaseWebAppConfiguration implements WebAppConfiguration {
         this.defaultUserTeam = src.defaultUserTeam;
         this.resourceManagerEnabled = src.resourceManagerEnabled;
         this.enabledFeatures = src.enabledFeatures;
-        this.disabledBetaFeatures = src.disabledBetaFeatures;
         this.showReadOnlyConnectionInfo = src.showReadOnlyConnectionInfo;
     }
 
@@ -84,18 +81,14 @@ public abstract class BaseWebAppConfiguration implements WebAppConfiguration {
         return resourceManagerEnabled;
     }
 
-    @Override
     public boolean isFeatureEnabled(String id) {
         return ArrayUtils.contains(getEnabledFeatures(), id);
     }
 
-    @Override
     public boolean isFeaturesEnabled(String[] features) {
         return ArrayUtils.containsAll(getEnabledFeatures(), features);
     }
 
-    @NotNull
-    @Override
     public String[] getEnabledFeatures() {
         if (enabledFeatures == null) {
             // No config - enable all features (+backward compatibility)
@@ -112,8 +105,4 @@ public abstract class BaseWebAppConfiguration implements WebAppConfiguration {
     public boolean isShowReadOnlyConnectionInfo() {
         return showReadOnlyConnectionInfo;
     }
-
-    public String[] getDisabledBetaFeatures() {
-        return disabledBetaFeatures;
-    }
 }

server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/app/BaseWebApplication.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.
@@ -16,7 +16,15 @@
  */
 package io.cloudbeaver.model.app;
 
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import io.cloudbeaver.DataSourceFilter;
+import io.cloudbeaver.WebProjectImpl;
+import io.cloudbeaver.WebSessionProjectImpl;
 import io.cloudbeaver.model.log.SLF4JLogHandler;
+import io.cloudbeaver.model.session.WebSession;
+import io.cloudbeaver.server.WebGlobalWorkspace;
+import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.equinox.app.IApplicationContext;
 import org.jkiss.code.NotNull;
@@ -24,16 +32,17 @@ import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBFileController;
+import org.jkiss.dbeaver.model.app.DBPPlatform;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
 import org.jkiss.dbeaver.model.auth.SMSessionContext;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.dbeaver.model.impl.app.ApplicationRegistry;
-import org.jkiss.dbeaver.model.impl.app.BaseApplicationImpl;
-import org.jkiss.dbeaver.model.impl.app.BaseWorkspaceImpl;
 import org.jkiss.dbeaver.model.rm.RMController;
+import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.model.secret.DBSSecretController;
 import org.jkiss.dbeaver.model.websocket.event.WSEventController;
+import org.jkiss.dbeaver.registry.BaseApplicationImpl;
 import org.jkiss.dbeaver.runtime.IVariableResolver;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.dbeaver.utils.RuntimeUtils;
@@ -54,9 +63,14 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
     public static final String CLI_PARAM_WEB_CONFIG = "-web-config";
     public static final String LOGBACK_FILE_NAME = "logback.xml";
 
+
     private static final Log log = Log.getLog(BaseWebApplication.class);
 
-    private String instanceId;
+    @NotNull
+    @Override
+    public DBPWorkspace createWorkspace(@NotNull DBPPlatform platform, @NotNull IWorkspace eclipseWorkspace) {
+        return new WebGlobalWorkspace(platform, eclipseWorkspace);
+    }
 
     @Override
     public RMController createResourceController(
@@ -88,21 +102,31 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
         return true;
     }
 
-    protected boolean loadServerConfiguration() throws DBException {
+    @Nullable
+    protected Path loadServerConfiguration() throws DBException {
         Path configFilePath = getMainConfigurationFilePath().toAbsolutePath();
+        Path configFolder = configFilePath.getParent();
 
+        // Configure logging
+        Path logbackConfigPath = getLogbackConfigPath(configFolder);
+
+        if (logbackConfigPath == null) {
+            System.err.println("Can't find slf4j configuration file in " + configFilePath.getParent());
+        } else {
+            System.setProperty("logback.configurationFile", logbackConfigPath.toString());
+        }
         Log.setLogHandler(new SLF4JLogHandler());
 
         // Load config file
         log.debug("Loading configuration from " + configFilePath);
         try {
-            getServerConfigurationController().loadServerConfiguration(configFilePath);
+            loadConfiguration(configFilePath);
         } catch (Exception e) {
             log.error("Error parsing configuration", e);
-            return false;
+            return null;
         }
 
-        return true;
+        return configFilePath;
     }
 
     @Nullable
@@ -129,7 +153,7 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
         return getLogbackConfigPath(configFolder);
     }
 
-    protected Path getMainConfigurationFilePath() {
+    private Path getMainConfigurationFilePath() {
         String configPath = DEFAULT_CONFIG_FILE_PATH;
 
         String[] args = Platform.getCommandLineArgs();
@@ -155,6 +179,21 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
         return Files.exists(customConfigPath) ? customConfigPath : configPath.resolve(fileName);
     }
 
+    protected abstract void loadConfiguration(Path configPath) throws DBException;
+
+    @Override
+    public WebProjectImpl createProjectImpl(
+        @NotNull WebSession webSession,
+        @NotNull RMProject project,
+        @NotNull DataSourceFilter dataSourceFilter
+    ) {
+        return new WebSessionProjectImpl(
+            webSession,
+            project,
+            dataSourceFilter
+        );
+    }
+
     /**
      * There is no secret controller in base web app.
      * Method returns VoidSecretController instance.
@@ -168,14 +207,12 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
         return VoidSecretController.INSTANCE;
     }
 
-    public static Map<String, Object> getServerConfigProps(Map<String, Object> configProps) {
+    protected static Map<String, Object> getServerConfigProps(Map<String, Object> configProps) {
         return JSONUtils.getObject(configProps, "server");
     }
 
     @SuppressWarnings("unchecked")
-    public static void patchConfigurationWithProperties(
-        Map<String, Object> configProps, IVariableResolver varResolver
-    ) {
+    public static void patchConfigurationWithProperties(Map<String, Object> configProps, IVariableResolver varResolver) {
         for (Map.Entry<String, Object> entry : configProps.entrySet()) {
             Object propValue = entry.getValue();
             if (propValue instanceof String) {
@@ -210,35 +247,16 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
     protected abstract void startServer() throws DBException;
 
     @Override
-    public synchronized String getApplicationInstanceId() throws DBException {
-        if (instanceId == null) {
-            try {
-                byte[] macAddress = RuntimeUtils.getLocalMacAddress();
-                instanceId = String.join(
-                    "_",
-                    ApplicationRegistry.getInstance().getApplication().getId(),
-                    getWorkspaceIdProperty(), // workspace id is read from property file
-                    CommonUtils.toHexString(macAddress),
-                    CommonUtils.toString(getServerPort())
-                );
-            } catch (Exception e) {
-                throw new DBException("Error during generation instance id generation", e);
-            }
+    public String getApplicationInstanceId() throws DBException {
+        try {
+            byte[] macAddress = RuntimeUtils.getLocalMacAddress();
+            String appId = ApplicationRegistry.getInstance().getApplication().getId();
+            return appId + "_" + CommonUtils.toHexString(macAddress) + getServerPort();
+        } catch (Exception e) {
+            throw new DBException("Error during generation instance id generation", e);
         }
-        return instanceId;
     }
 
-    @NotNull
-    public String getWorkspaceIdProperty() throws DBException {
-        return BaseWorkspaceImpl.readWorkspaceIdProperty();
-    }
-
-    @Override
-    public Path getWorkspaceDirectory() {
-        return getServerConfigurationController().getWorkspacePath();
-    }
-
-
     public String getApplicationId() {
         try {
             return getApplicationInstanceId();
@@ -252,18 +270,14 @@ public abstract class BaseWebApplication extends BaseApplicationImpl implements
         return null;
     }
 
-    public abstract WebServerConfigurationController getServerConfigurationController();
+    protected Gson getGson() {
+        return getGsonBuilder().create();
+    }
+
+    protected abstract GsonBuilder getGsonBuilder();
 
     @Override
     public boolean isEnvironmentVariablesAccessible() {
         return false;
     }
-
-    protected void closeResource(String name, Runnable closeFunction) {
-        try {
-            closeFunction.run();
-        } catch (Exception e) {
-            log.error("Failed close " + name, e);
-        }
-    }
 }