Merge branch 'devel' into dbeaver/pro#5476-task-scheduler-refactor

dbeaver/pro#7017 limit max idle time for anonymous user (#3846 )
Co-authored-by: Daria Marutkina <125263541+dariamarutkina@users.noreply.github.com>
2026-10-16 14:50:15 +08:00 · 2025-10-27 16:02:04 +03:00 · 2025-10-27 11:38:34 +01:00 · 2025-10-27 17:09:23 +08:00 · 2025-10-24 18:30:41 +02:00 · 2025-10-24 17:32:15 +03:00
3054 changed files with 76770 additions and 59356 deletions
@@ -1,29 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve CloudBeaver
-title: ''
-labels: bug, wait for review
-assignees: ''
-
---
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here, e.g. error log.
@@ -0,0 +1,61 @@
+name: 🐛 Bug Report
+description: Create a report to help us improve our product
+labels: [wait for review]
+type: Bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for reporting a bug in CloudBeaver!
+        To ensure we can address the issue as quickly and efficiently as possible, please provide as much detail as you can in the fields below.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: |
+        A clear and concise description of the issue being addressed.
+         - Describe the actual problematic behavior.
+         - Ensure private information is redacted.
+         - Include console output or log files if relevant.
+         - If applicable, add screenshots or screen recordings to help explain your problem.
+      placeholder: |
+        Please enter a description of the issue. Here you can also attach log files, screenshots or a video
+    validations:
+      required: true
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce
+      description: Describe the steps to reproduce the bug
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected/Desired Behavior
+      description: |
+        A clear and concise description of what happens in the software **after** a fix is created and merged.
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: CloudBeaver Version
+      description: What version of CloudBeaver are you running?
+      placeholder: ex. CloudBeaver Community 25.0.0
+    validations:
+      required: true
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Any additional context about the environment
+      placeholder: |
+        Example:
+        1. OS: [e.g. iOS, Ubuntu, Windows 11]
+        2. Browser: [e.g. Chrome, Safari]
+    validations:
+      required: false
@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Read our documentations
+    url: https://dbeaver.com/docs/cloudbeaver
+    about: Many articles about product deployment and features.
+  - name: Try advanced database management features in DBeaver PRO or CloudBeaver EE
+    url: https://dbeaver.com/download/?utm_source=github&utm_medium=social&utm_campaign=issue
+    about: Download a 14-day free trial on dbeaver.com. No credit card is needed.
+  - name: Learn how to use CloudBeaver effectively with our tutorial videos
+    url: https://www.youtube.com/channel/UC-yOjsQLSaJVEghg6UB3N7A
+    about: Subscribe to our YouTube channel and watch new tutorials every week.
+  - name: Follow us on X (ex. Twitter)
+    url: https://x.com/dbeaver_news
+    about: Get everyday tips, fresh news, and DBeaver/CloudBeaver feature overviews.
@@ -1,8 +1,9 @@
 ---
-name: Feature request
-about: Suggest an idea for CloudBeaver
+name: Feature Request
+about: Provide a description of your feature request for CloudBeaver. Include the problem you are trying to solve, why it is important, and any specific functionality you believe would improve the platform.
 title: ''
-labels: feature request, wait for review
+labels: wait for review
+type: Feature
 assignees: ''

 ---
@@ -12,3 +13,9 @@ A clear and concise description of what the problem is. Ex. I'm always frustrate

 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
@@ -1,8 +1,9 @@
 ---
 name: Question
-about: Is there something unclear?
+about: Is there something unclear? Ask your question.
 title: ''
-labels: question, wait for review
+labels: wait for review
+type: Question
 assignees: ''

 ---
@@ -20,11 +20,11 @@ jobs:
        with:
          project_deps_path: "./cloudbeaver/project.deps"

-      - name: Set up JDK 17
+      - name: Set up JDK 21
        uses: actions/setup-java@v4
        with:
          distribution: "temurin"
-          java-version: "17"
+          java-version: "21"
          cache: maven

      - uses: dbeaver/github-actions/install-maven@devel
@@ -11,9 +11,9 @@ on:
        description: "Test status"
        value: ${{ jobs.frontend-build.outputs.test-status }}
    inputs:
-      skip_cache:
+      clean-cache:
        required: false
-        type: string
+        type: boolean

 jobs:
  frontend-build:
@@ -29,42 +29,45 @@ jobs:

    defaults:
      run:
-        working-directory: ./webapp
+        working-directory: ./cloudbeaver/webapp

    steps:
-      - uses: actions/checkout@v4
+      - name: Checkout cloudbeaver
+        uses: actions/checkout@v4
+        with:
+          path: cloudbeaver
+
+      - name: Clone Deps Repositories
+        uses: dbeaver/github-actions/clone-repositories@devel
+        with:
+          project_deps_path: "./cloudbeaver/project.deps"
+          token: ${{ secrets.DEVOPS_ISSUE_RO_TOKEN }}

      - run: corepack enable
      - uses: actions/setup-node@v4
        with:
-          node-version: "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-
+          node-version: "lts/*"
+          cache: "yarn"
+          cache-dependency-path: |
+            cloudbeaver/webapp/yarn.lock

      - name: restore typescript cache
        uses: actions/cache@v4
        with:
-          path: "**/packages/*/dist"
-          key: ${{ runner.os }}-dist-${{ hashFiles('webapp/yarn.lock') }}
+          path: |
+            "cloudbeaver/webapp/common-*/**/*/lib"
+            "cloudbeaver/webapp/**/packages/*/dist"
+          key: ${{ runner.os }}-dist-${{ hashFiles('cloudbeaver/webapp/yarn.lock') }}
          restore-keys: |
            ${{ runner.os }}-dist-

-      - name: yarn clean
-        if: env.skip_cache == 'true'
+      - if: inputs.clean-cache
        run: yarn clear

      - run: yarn install --immutable

      - run: yarn bundle
-        working-directory: ./webapp/packages/product-default
+        working-directory: ./cloudbeaver/webapp/packages/product-default

      - run: yarn test

@@ -14,25 +14,26 @@ jobs:

    defaults:
      run:
-        working-directory: ./webapp
-        
+        working-directory: ./cloudbeaver/webapp
+
    steps:
-      - uses: actions/checkout@v4
+      - name: Checkout cloudbeaver
+        uses: actions/checkout@v4
+        with:
+          path: cloudbeaver

      - run: corepack enable
      - uses: actions/setup-node@v4
        with:
-          node-version: "20"
-          cache: yarn
-          cache-dependency-path: webapp/yarn.lock
+          node-version: "lts/*"
+          cache: "yarn"
+          cache-dependency-path: "./cloudbeaver/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
+      #   working-directory: ./cloudbeaver/webapp/common-typescript
+
+      # - run: yarn install --immutable
+      #   working-directory: ./cloudbeaver/webapp/common-react

      - run: |
          yarn install --immutable
@@ -10,14 +10,24 @@ on:
    branches: [devel]

 concurrency:
-  group: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || 'push-pr-devel' }}
+  group: ${{ github.workflow }}-${{ github.event_name == 'pull_request' && github.event.pull_request.number || github.ref_name }}
  cancel-in-progress: true

 jobs:
  build-server:
-    name: Server
-    uses: ./.github/workflows/backend-build.yml
+    uses: dbeaver/dbeaver-common/.github/workflows/mvn-package.yml@devel
+    name: Check
    secrets: inherit
+    with:
+      mvn-args: -Dplain-api-server -Dheadless-platform
+      project-directory: ./cloudbeaver/server/product/aggregate
+      project-deps: ./cloudbeaver/project.deps
+      timeout-minutes: 5
+
+  # build-server:
+  #   name: Server
+  #   uses: ./.github/workflows/backend-build.yml
+  #   secrets: inherit

  build-frontend:
    name: Frontend
@@ -46,4 +46,5 @@ server/test/io.cloudbeaver.test.platform/workspace/.data/
 workspace-dev-ce/
 deploy/cloudbeaver
 server/**/target
-apps/**/target
+apps/**/target
+osgi-cache/
@@ -19,6 +19,7 @@
    "yzhang.markdown-all-in-one",
    "GraphQL.vscode-graphql-syntax",
    "mrmlnc.vscode-json5",
-    "esbenp.prettier-vscode"
+    "esbenp.prettier-vscode",
+    "devnaumov.licensify"
  ]
 }
@@ -18,7 +18,7 @@
    {
      "type": "java",
      "name": "CloudBeaver CE Server",
-      "cwd": "${workspaceFolder}/../opt/cbce",
+      "cwd": "${workspaceFolder}/../dbeaver-workspace/app-workspace/cbce",
      "request": "launch",
      "mainClass": "org.jkiss.dbeaver.launcher.DBeaverLauncher",
      "args": [
@@ -48,7 +48,7 @@
        "-Declipse.pde.launch=true",
        "-XstartOnFirstThread",
        "-Dfile.encoding=UTF-8",
-        "--add-modules=ALL-SYSTEM",
+        "--add-modules=ALL-DEFAULT",
        "--add-opens=java.base/java.io=ALL-UNNAMED",
        "--add-opens=java.base/java.lang=ALL-UNNAMED",
        "--add-opens=java.base/java.lang.reflect=ALL-UNNAMED",
@@ -1,15 +0,0 @@
-{
-  "license": {
-    "scope": "typescript,typescriptreact,javascript,javascriptreact,css,scss",
-    "prefix": "license",
-    "body": [
-      "/*",
-      " * CloudBeaver - Cloud Database Manager",
-      " * Copyright (C) 2020-2024 DBeaver Corp and others",
-      " *",
-      " * Licensed under the Apache License, Version 2.0.",
-      " * you may not use this file except in compliance with the License.",
-      " */"
-    ]
-  }
-}
@@ -2,19 +2,18 @@
  "editor.tabSize": 2,
  "editor.formatOnSave": true,
  "editor.linkedEditing": true,
-
  "task.autoDetect": "off",
-
  "java.configuration.updateBuildConfiguration": "automatic",
  "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx16G -Xms100m -Xlog:disable",
  "java.compile.nullAnalysis.mode": "automatic",
-
  "typescript.preferences.useAliasesForRenames": false,
  "typescript.preferences.importModuleSpecifier": "relative",
  "typescript.preferences.includePackageJsonAutoImports": "on",
  "typescript.preferences.quoteStyle": "single",
-  "typescript.tsdk": "webapp/node_modules/typescript/lib",
-
+  "typescript.tsdk": "webapp/.yarn/sdks/typescript/lib",
+  "typescript.enablePromptUseWorkspaceTsdk": true,
+  "prettier.prettierPath": "webapp/.yarn/sdks/prettier/index.cjs",
+  "eslint.nodePath": "webapp/.yarn/sdks",
  "eslint.enable": true,
  "eslint.validate": [
    "javascript",
@@ -22,8 +21,9 @@
    "typescript",
    "typescriptreact"
  ],
-  "eslint.workingDirectories": ["webapp"],
-
+  "eslint.workingDirectories": [
+    "webapp"
+  ],
  "editor.defaultFormatter": "esbenp.prettier-vscode",
  "[javascript]": {
    "editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -40,12 +40,10 @@
  "[java]": {
    "editor.defaultFormatter": "redhat.java"
  },
-
  "files.eol": "\n",
  "files.associations": {
    "*.css": "postcss"
  },
-
  "java.checkstyle.configuration": "${workspaceFolder}/../dbeaver-common/.github/dbeaver-checkstyle-config.xml",
  "java.checkstyle.version": "10.12.0"
-}
+}
@@ -19,6 +19,26 @@
      "group": "test",
      "args": ["test"]
    },
+    {
+      "label": "Run Tests Common Typescript",
+      "type": "shell",
+      "command": "yarn",
+      "group": "test",
+      "args": ["test"],
+      "options": {
+        "cwd": "${workspaceFolder}/webapp/common-typescript"
+      }
+    },
+    {
+      "label": "Run Tests Common React",
+      "type": "shell",
+      "command": "yarn",
+      "group": "test",
+      "args": ["test"],
+      "options": {
+        "cwd": "${workspaceFolder}/webapp/common-react"
+      }
+    },
    {
      "label": "Run DevServer CE",
      "group": "build",
@@ -72,10 +92,10 @@
      "label": "Run Backend CE",
      "type": "shell",
      "windows": {
-        "command": "./run-server.bat"
+        "command": "./run-cloudbeaver-server.bat"
      },
      "osx": {
-        "command": "./run-server.sh"
+        "command": "./run-cloudbeaver-server.sh"
      },
      "options": {
        "cwd": "${workspaceFolder}/deploy/cloudbeaver"
@@ -92,18 +112,10 @@
        "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",
+      "command": "yarn clear",
      "options": {
        "cwd": "${workspaceFolder}/webapp"
      }
@@ -115,6 +127,24 @@
      "options": {
        "cwd": "${workspaceFolder}/webapp/packages"
      }
+    },
+    {
+      "label": "Run Ui Kit Preview",
+      "type": "shell",
+      "command": "yarn",
+      "options": {
+        "cwd": "${workspaceFolder}/webapp/common-react/@dbeaver/ui-kit"
+      },
+      "args": ["docs"]
+    },
+    {
+      "label": "Run Storybook",
+      "type": "shell",
+      "command": "yarn",
+      "options": {
+        "cwd": "${workspaceFolder}/webapp/packages/storybook"
+      },
+      "args": ["storybook"]
    }
  ],
  "inputs": [
@@ -0,0 +1,10 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{js,json,yml}]
+charset = utf-8
+indent_style = space
+indent_size = 2
@@ -0,0 +1,4 @@
+/.yarn/**            linguist-vendored
+/.yarn/releases/*    binary
+/.yarn/plugins/**/*  binary
+/.pnp.*              binary linguist-generated
@@ -0,0 +1,14 @@
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+!.yarn/sdks/**
+
+# Swap the comments on the following lines if you wish to use zero-installs
+# In that case, don't forget to run `yarn config set enableGlobalCache false`!
+# Documentation here: https://yarnpkg.com/features/caching#zero-installs
+
+#!.yarn/cache
+.pnp.*
@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "arcanis.vscode-zipfs"
+  ]
+}
@@ -0,0 +1,8 @@
+{
+  "search.exclude": {
+    "**/.yarn": true,
+    "**/.pnp.*": true
+  },
+  "typescript.tsdk": ".yarn/sdks/typescript/lib",
+  "typescript.enablePromptUseWorkspaceTsdk": true
+}
@@ -0,0 +1,5 @@
+# This file is automatically generated by @yarnpkg/sdks.
+# Manual changes might be lost!
+
+integrations:
+  - vscode
@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire, register} = require(`module`);
+const {resolve} = require(`path`);
+const {pathToFileURL} = require(`url`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
+const absRequire = createRequire(absPnpApiPath);
+
+const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
+const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/bin/tsc
+    require(absPnpApiPath).setup();
+    if (isPnpLoaderEnabled && register) {
+      register(pathToFileURL(absPnpLoaderPath));
+    }
+  }
+}
+
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
+// Defer to the real typescript/bin/tsc your application uses
+module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsc`));
@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire, register} = require(`module`);
+const {resolve} = require(`path`);
+const {pathToFileURL} = require(`url`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
+const absRequire = createRequire(absPnpApiPath);
+
+const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
+const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/bin/tsserver
+    require(absPnpApiPath).setup();
+    if (isPnpLoaderEnabled && register) {
+      register(pathToFileURL(absPnpLoaderPath));
+    }
+  }
+}
+
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
+// Defer to the real typescript/bin/tsserver your application uses
+module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsserver`));
@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire, register} = require(`module`);
+const {resolve} = require(`path`);
+const {pathToFileURL} = require(`url`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
+const absRequire = createRequire(absPnpApiPath);
+
+const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
+const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/lib/tsc.js
+    require(absPnpApiPath).setup();
+    if (isPnpLoaderEnabled && register) {
+      register(pathToFileURL(absPnpLoaderPath));
+    }
+  }
+}
+
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
+// Defer to the real typescript/lib/tsc.js your application uses
+module.exports = wrapWithUserWrapper(absRequire(`typescript/lib/tsc.js`));
@@ -0,0 +1,248 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire, register} = require(`module`);
+const {resolve} = require(`path`);
+const {pathToFileURL} = require(`url`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
+const absRequire = createRequire(absPnpApiPath);
+
+const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
+const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/lib/tsserver.js
+    require(absPnpApiPath).setup();
+    if (isPnpLoaderEnabled && register) {
+      register(pathToFileURL(absPnpLoaderPath));
+    }
+  }
+}
+
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
+const moduleWrapper = exports => {
+  return wrapWithUserWrapper(moduleWrapperFn(exports));
+};
+
+const moduleWrapperFn = tsserver => {
+  if (!process.versions.pnp) {
+    return tsserver;
+  }
+
+  const {isAbsolute} = require(`path`);
+  const pnpApi = require(`pnpapi`);
+
+  const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
+  const isPortal = str => str.startsWith("portal:/");
+  const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
+
+  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
+    return `${locator.name}@${locator.reference}`;
+  }));
+
+  // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
+  // doesn't understand. This layer makes sure to remove the protocol
+  // before forwarding it to TS, and to add it back on all returned paths.
+
+  function toEditorPath(str) {
+    // We add the `zip:` prefix to both `.zip/` paths and virtual paths
+    if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) {
+      // We also take the opportunity to turn virtual paths into physical ones;
+      // this makes it much easier to work with workspaces that list peer
+      // dependencies, since otherwise Ctrl+Click would bring us to the virtual
+      // file instances instead of the real ones.
+      //
+      // We only do this to modules owned by the the dependency tree roots.
+      // This avoids breaking the resolution when jumping inside a vendor
+      // with peer dep (otherwise jumping into react-dom would show resolution
+      // errors on react).
+      //
+      const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
+      if (resolved) {
+        const locator = pnpApi.findPackageLocator(resolved);
+        if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
+          str = resolved;
+        }
+      }
+
+      str = normalize(str);
+
+      if (str.match(/\.zip\//)) {
+        switch (hostInfo) {
+          // Absolute VSCode `Uri.fsPath`s need to start with a slash.
+          // VSCode only adds it automatically for supported schemes,
+          // so we have to do it manually for the `zip` scheme.
+          // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
+          //
+          // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
+          //
+          // 2021-10-08: VSCode changed the format in 1.61.
+          // Before | ^zip:/c:/foo/bar.zip/package.json
+          // After  | ^/zip//c:/foo/bar.zip/package.json
+          //
+          // 2022-04-06: VSCode changed the format in 1.66.
+          // Before | ^/zip//c:/foo/bar.zip/package.json
+          // After  | ^/zip/c:/foo/bar.zip/package.json
+          //
+          // 2022-05-06: VSCode changed the format in 1.68
+          // Before | ^/zip/c:/foo/bar.zip/package.json
+          // After  | ^/zip//c:/foo/bar.zip/package.json
+          //
+          case `vscode <1.61`: {
+            str = `^zip:${str}`;
+          } break;
+
+          case `vscode <1.66`: {
+            str = `^/zip/${str}`;
+          } break;
+
+          case `vscode <1.68`: {
+            str = `^/zip${str}`;
+          } break;
+
+          case `vscode`: {
+            str = `^/zip/${str}`;
+          } break;
+
+          // To make "go to definition" work,
+          // We have to resolve the actual file system path from virtual path
+          // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
+          case `coc-nvim`: {
+            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+            str = resolve(`zipfile:${str}`);
+          } break;
+
+          // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server)
+          // We have to resolve the actual file system path from virtual path,
+          // everything else is up to neovim
+          case `neovim`: {
+            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+            str = `zipfile://${str}`;
+          } break;
+
+          default: {
+            str = `zip:${str}`;
+          } break;
+        }
+      } else {
+        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
+      }
+    }
+
+    return str;
+  }
+
+  function fromEditorPath(str) {
+    switch (hostInfo) {
+      case `coc-nvim`: {
+        str = str.replace(/\.zip::/, `.zip/`);
+        // The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
+        // So in order to convert it back, we use .* to match all the thing
+        // before `zipfile:`
+        return process.platform === `win32`
+          ? str.replace(/^.*zipfile:\//, ``)
+          : str.replace(/^.*zipfile:/, ``);
+      } break;
+
+      case `neovim`: {
+        str = str.replace(/\.zip::/, `.zip/`);
+        // The path for neovim is in format of zipfile:///<pwd>/.yarn/...
+        return str.replace(/^zipfile:\/\//, ``);
+      } break;
+
+      case `vscode`:
+      default: {
+        return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
+      } break;
+    }
+  }
+
+  // Force enable 'allowLocalPluginLoads'
+  // TypeScript tries to resolve plugins using a path relative to itself
+  // which doesn't work when using the global cache
+  // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
+  // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
+  // TypeScript already does local loads and if this code is running the user trusts the workspace
+  // https://github.com/microsoft/vscode/issues/45856
+  const ConfiguredProject = tsserver.server.ConfiguredProject;
+  const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
+  ConfiguredProject.prototype.enablePluginsWithOptions = function() {
+    this.projectService.allowLocalPluginLoads = true;
+    return originalEnablePluginsWithOptions.apply(this, arguments);
+  };
+
+  // And here is the point where we hijack the VSCode <-> TS communications
+  // by adding ourselves in the middle. We locate everything that looks
+  // like an absolute path of ours and normalize it.
+
+  const Session = tsserver.server.Session;
+  const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
+  let hostInfo = `unknown`;
+
+  Object.assign(Session.prototype, {
+    onMessage(/** @type {string | object} */ message) {
+      const isStringMessage = typeof message === 'string';
+      const parsedMessage = isStringMessage ? JSON.parse(message) : message;
+
+      if (
+        parsedMessage != null &&
+        typeof parsedMessage === `object` &&
+        parsedMessage.arguments &&
+        typeof parsedMessage.arguments.hostInfo === `string`
+      ) {
+        hostInfo = parsedMessage.arguments.hostInfo;
+        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
+          const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match(
+            // The RegExp from https://semver.org/ but without the caret at the start
+            /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
+          ) ?? []).map(Number)
+
+          if (major === 1) {
+            if (minor < 61) {
+              hostInfo += ` <1.61`;
+            } else if (minor < 66) {
+              hostInfo += ` <1.66`;
+            } else if (minor < 68) {
+              hostInfo += ` <1.68`;
+            }
+          }
+        }
+      }
+
+      const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => {
+        return typeof value === 'string' ? fromEditorPath(value) : value;
+      });
+
+      return originalOnMessage.call(
+        this,
+        isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON)
+      );
+    },
+
+    send(/** @type {any} */ msg) {
+      return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
+        return typeof value === `string` ? toEditorPath(value) : value;
+      })));
+    }
+  });
+
+  return tsserver;
+};
+
+const [major, minor] = absRequire(`typescript/package.json`).version.split(`.`, 2).map(value => parseInt(value, 10));
+// In TypeScript@>=5.5 the tsserver uses the public TypeScript API so that needs to be patched as well.
+// Ref https://github.com/microsoft/TypeScript/pull/55326
+if (major > 5 || (major === 5 && minor >= 5)) {
+  moduleWrapper(absRequire(`typescript`));
+}
+
+// Defer to the real typescript/lib/tsserver.js your application uses
+module.exports = moduleWrapper(absRequire(`typescript/lib/tsserver.js`));
@@ -0,0 +1,248 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire, register} = require(`module`);
+const {resolve} = require(`path`);
+const {pathToFileURL} = require(`url`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
+const absRequire = createRequire(absPnpApiPath);
+
+const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
+const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript/lib/tsserverlibrary.js
+    require(absPnpApiPath).setup();
+    if (isPnpLoaderEnabled && register) {
+      register(pathToFileURL(absPnpLoaderPath));
+    }
+  }
+}
+
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
+const moduleWrapper = exports => {
+  return wrapWithUserWrapper(moduleWrapperFn(exports));
+};
+
+const moduleWrapperFn = tsserver => {
+  if (!process.versions.pnp) {
+    return tsserver;
+  }
+
+  const {isAbsolute} = require(`path`);
+  const pnpApi = require(`pnpapi`);
+
+  const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//);
+  const isPortal = str => str.startsWith("portal:/");
+  const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`);
+
+  const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
+    return `${locator.name}@${locator.reference}`;
+  }));
+
+  // VSCode sends the zip paths to TS using the "zip://" prefix, that TS
+  // doesn't understand. This layer makes sure to remove the protocol
+  // before forwarding it to TS, and to add it back on all returned paths.
+
+  function toEditorPath(str) {
+    // We add the `zip:` prefix to both `.zip/` paths and virtual paths
+    if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) {
+      // We also take the opportunity to turn virtual paths into physical ones;
+      // this makes it much easier to work with workspaces that list peer
+      // dependencies, since otherwise Ctrl+Click would bring us to the virtual
+      // file instances instead of the real ones.
+      //
+      // We only do this to modules owned by the the dependency tree roots.
+      // This avoids breaking the resolution when jumping inside a vendor
+      // with peer dep (otherwise jumping into react-dom would show resolution
+      // errors on react).
+      //
+      const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
+      if (resolved) {
+        const locator = pnpApi.findPackageLocator(resolved);
+        if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) {
+          str = resolved;
+        }
+      }
+
+      str = normalize(str);
+
+      if (str.match(/\.zip\//)) {
+        switch (hostInfo) {
+          // Absolute VSCode `Uri.fsPath`s need to start with a slash.
+          // VSCode only adds it automatically for supported schemes,
+          // so we have to do it manually for the `zip` scheme.
+          // The path needs to start with a caret otherwise VSCode doesn't handle the protocol
+          //
+          // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910
+          //
+          // 2021-10-08: VSCode changed the format in 1.61.
+          // Before | ^zip:/c:/foo/bar.zip/package.json
+          // After  | ^/zip//c:/foo/bar.zip/package.json
+          //
+          // 2022-04-06: VSCode changed the format in 1.66.
+          // Before | ^/zip//c:/foo/bar.zip/package.json
+          // After  | ^/zip/c:/foo/bar.zip/package.json
+          //
+          // 2022-05-06: VSCode changed the format in 1.68
+          // Before | ^/zip/c:/foo/bar.zip/package.json
+          // After  | ^/zip//c:/foo/bar.zip/package.json
+          //
+          case `vscode <1.61`: {
+            str = `^zip:${str}`;
+          } break;
+
+          case `vscode <1.66`: {
+            str = `^/zip/${str}`;
+          } break;
+
+          case `vscode <1.68`: {
+            str = `^/zip${str}`;
+          } break;
+
+          case `vscode`: {
+            str = `^/zip/${str}`;
+          } break;
+
+          // To make "go to definition" work,
+          // We have to resolve the actual file system path from virtual path
+          // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip)
+          case `coc-nvim`: {
+            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+            str = resolve(`zipfile:${str}`);
+          } break;
+
+          // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server)
+          // We have to resolve the actual file system path from virtual path,
+          // everything else is up to neovim
+          case `neovim`: {
+            str = normalize(resolved).replace(/\.zip\//, `.zip::`);
+            str = `zipfile://${str}`;
+          } break;
+
+          default: {
+            str = `zip:${str}`;
+          } break;
+        }
+      } else {
+        str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
+      }
+    }
+
+    return str;
+  }
+
+  function fromEditorPath(str) {
+    switch (hostInfo) {
+      case `coc-nvim`: {
+        str = str.replace(/\.zip::/, `.zip/`);
+        // The path for coc-nvim is in format of /<pwd>/zipfile:/<pwd>/.yarn/...
+        // So in order to convert it back, we use .* to match all the thing
+        // before `zipfile:`
+        return process.platform === `win32`
+          ? str.replace(/^.*zipfile:\//, ``)
+          : str.replace(/^.*zipfile:/, ``);
+      } break;
+
+      case `neovim`: {
+        str = str.replace(/\.zip::/, `.zip/`);
+        // The path for neovim is in format of zipfile:///<pwd>/.yarn/...
+        return str.replace(/^zipfile:\/\//, ``);
+      } break;
+
+      case `vscode`:
+      default: {
+        return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`)
+      } break;
+    }
+  }
+
+  // Force enable 'allowLocalPluginLoads'
+  // TypeScript tries to resolve plugins using a path relative to itself
+  // which doesn't work when using the global cache
+  // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238
+  // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but
+  // TypeScript already does local loads and if this code is running the user trusts the workspace
+  // https://github.com/microsoft/vscode/issues/45856
+  const ConfiguredProject = tsserver.server.ConfiguredProject;
+  const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype;
+  ConfiguredProject.prototype.enablePluginsWithOptions = function() {
+    this.projectService.allowLocalPluginLoads = true;
+    return originalEnablePluginsWithOptions.apply(this, arguments);
+  };
+
+  // And here is the point where we hijack the VSCode <-> TS communications
+  // by adding ourselves in the middle. We locate everything that looks
+  // like an absolute path of ours and normalize it.
+
+  const Session = tsserver.server.Session;
+  const {onMessage: originalOnMessage, send: originalSend} = Session.prototype;
+  let hostInfo = `unknown`;
+
+  Object.assign(Session.prototype, {
+    onMessage(/** @type {string | object} */ message) {
+      const isStringMessage = typeof message === 'string';
+      const parsedMessage = isStringMessage ? JSON.parse(message) : message;
+
+      if (
+        parsedMessage != null &&
+        typeof parsedMessage === `object` &&
+        parsedMessage.arguments &&
+        typeof parsedMessage.arguments.hostInfo === `string`
+      ) {
+        hostInfo = parsedMessage.arguments.hostInfo;
+        if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) {
+          const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match(
+            // The RegExp from https://semver.org/ but without the caret at the start
+            /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
+          ) ?? []).map(Number)
+
+          if (major === 1) {
+            if (minor < 61) {
+              hostInfo += ` <1.61`;
+            } else if (minor < 66) {
+              hostInfo += ` <1.66`;
+            } else if (minor < 68) {
+              hostInfo += ` <1.68`;
+            }
+          }
+        }
+      }
+
+      const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => {
+        return typeof value === 'string' ? fromEditorPath(value) : value;
+      });
+
+      return originalOnMessage.call(
+        this,
+        isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON)
+      );
+    },
+
+    send(/** @type {any} */ msg) {
+      return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => {
+        return typeof value === `string` ? toEditorPath(value) : value;
+      })));
+    }
+  });
+
+  return tsserver;
+};
+
+const [major, minor] = absRequire(`typescript/package.json`).version.split(`.`, 2).map(value => parseInt(value, 10));
+// In TypeScript@>=5.5 the tsserver uses the public TypeScript API so that needs to be patched as well.
+// Ref https://github.com/microsoft/TypeScript/pull/55326
+if (major > 5 || (major === 5 && minor >= 5)) {
+  moduleWrapper(absRequire(`typescript`));
+}
+
+// Defer to the real typescript/lib/tsserverlibrary.js your application uses
+module.exports = moduleWrapper(absRequire(`typescript/lib/tsserverlibrary.js`));
@@ -0,0 +1,32 @@
+#!/usr/bin/env node
+
+const {existsSync} = require(`fs`);
+const {createRequire, register} = require(`module`);
+const {resolve} = require(`path`);
+const {pathToFileURL} = require(`url`);
+
+const relPnpApiPath = "../../../../.pnp.cjs";
+
+const absPnpApiPath = resolve(__dirname, relPnpApiPath);
+const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`);
+const absRequire = createRequire(absPnpApiPath);
+
+const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`);
+const isPnpLoaderEnabled = existsSync(absPnpLoaderPath);
+
+if (existsSync(absPnpApiPath)) {
+  if (!process.versions.pnp) {
+    // Setup the environment to be able to require typescript
+    require(absPnpApiPath).setup();
+    if (isPnpLoaderEnabled && register) {
+      register(pathToFileURL(absPnpLoaderPath));
+    }
+  }
+}
+
+const wrapWithUserWrapper = existsSync(absUserWrapperPath)
+  ? exports => absRequire(absUserWrapperPath)(exports)
+  : exports => exports;
+
+// Defer to the real typescript your application uses
+module.exports = wrapWithUserWrapper(absRequire(`typescript`));
@@ -0,0 +1,10 @@
+{
+  "name": "typescript",
+  "version": "5.8.3-sdk",
+  "main": "./lib/typescript.js",
+  "type": "commonjs",
+  "bin": {
+    "tsc": "./bin/tsc",
+    "tsserver": "./bin/tsserver"
+  }
+}
@@ -0,0 +1,7 @@
+# vscode-java-configs
+
+
+## FAQ
+
+### Typescript Server crashed 5 times
+  - Open `.pnp.cjs` and replace `bestCandidate.apiPaths.length === 1` with `bestCandidate.apiPaths.length > 0`
@@ -2,6 +2,6 @@
 <?pde version="3.8"?>
 <target name="org.jkiss.cloudbeaver.tp">
 	<locations>
-		<location path="../dbeaver-workspace/dependencies/plugins" type="Directory"/>
+		<location path="../../../dbeaver-workspace/dependencies/plugins" type="Directory"/>
 	</locations>
-</target>
+</target>
@@ -0,0 +1,7 @@
+{
+  "name": "vscode-java-configs",
+  "packageManager": "yarn@4.9.2",
+  "devDependencies": {
+    "typescript": "^5.8.3"
+  }
+}
@@ -0,0 +1,34 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 8
+  cacheKey: 10c0
+
+"typescript@npm:^5.8.3":
+  version: 5.8.3
+  resolution: "typescript@npm:5.8.3"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10c0/5f8bb01196e542e64d44db3d16ee0e4063ce4f3e3966df6005f2588e86d91c03e1fb131c2581baf0fb65ee79669eea6e161cd448178986587e9f6844446dbb48
+  languageName: node
+  linkType: hard
+
+"typescript@patch:typescript@npm%3A^5.8.3#optional!builtin<compat/typescript>":
+  version: 5.8.3
+  resolution: "typescript@patch:typescript@npm%3A5.8.3#optional!builtin<compat/typescript>::version=5.8.3&hash=5786d5"
+  bin:
+    tsc: bin/tsc
+    tsserver: bin/tsserver
+  checksum: 10c0/39117e346ff8ebd87ae1510b3a77d5d92dae5a89bde588c747d25da5c146603a99c8ee588c7ef80faaf123d89ed46f6dbd918d534d641083177d5fac38b8a1cb
+  languageName: node
+  linkType: hard
+
+"vscode-java-configs@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "vscode-java-configs@workspace:."
+  dependencies:
+    typescript: "npm:^5.8.3"
+  languageName: unknown
+  linkType: soft
@@ -7,7 +7,7 @@ CloudBeaver is a web server that provides a rich web interface. The server itsel
 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/connection-creation-demo.png" width="400"/>
+<a><img src="https://github.com/dbeaver/cloudbeaver/wiki/images/connection-creation-demo.png" width="400"/></a>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/gis-demo.png" width="400"/>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/data-transfer-demo.png" width="400"/>
 <img src="https://github.com/dbeaver/cloudbeaver/wiki/images/sql-editor-demo.png" width="400"/>
@@ -15,7 +15,7 @@ See our [WIKI](https://github.com/dbeaver/cloudbeaver/wiki) for more details.
 ## Run in Docker

 - [Official Docker repository](https://hub.docker.com/r/dbeaver/cloudbeaver)
- [Running instructions](https://github.com/dbeaver/cloudbeaver/wiki/Run-Docker-Container)
+- [Deployment instructions](https://github.com/dbeaver/cloudbeaver/wiki/CloudBeaver-Deployment)

 ## Demo server

@@ -25,59 +25,52 @@ You can see a live demo of CloudBeaver here: https://demo.cloudbeaver.io

 ## Changelog

-### 24.3.3. 2025-01-20
- Administration:
-  -    Added an ability to match users from LDAP configuration with CloudBeaver users;
-  -    New environment variables were introduced for theme styling, SQL editor, and log viewer settings. You can use them for quick setup during the initial Docker configuration stage.
- General:
-  -    An ability to show metadata object comments was added in the Navigator tree. You can enable it in the database navigator settings panel;
-  -    Added transaction log viewing for connections with manual commit mode. This allows users to see all modifying statements before committing;
-  -    Added an ability to import data in tables without unique keys;
-  -    Added an ability to insert data in tables without unique keys;
-  -    Added Ctrl + Shift + S (Cmd + Shift + S on Mac) shortcut for "Save As Script" action.
+### 25.2.3 2025-10-20
+- Added visualization for column reordering in the Data Editor;
+- Fixed the critical issue with duplicating the execution of queries executed by a shortcut in the SQL Editor;
+- Fixed the critical vulnerability (CVE-2025-61927) in the Happy DOM library. The library was updated to version 20.0.2.

-### 24.3.2. 2025-01-06
- Added an ability to specify a user login as an attribute parameter for LDAP providers;
- The collapse of the grouping panel doesn't lead to the full panel cleaning anymore.
-  
-### 24.3.1. 2024-12-23
- Added an ability to reconnect for all editors if a connection has been lost;
- Added an option to replace line break characters on any custom value when exporting to CSV;
- Added an ability to create connections in the Navigation tree not only on the initial level but in folders and sub-folders directly;
- Updated list of available shortcuts for MacOS.
+### 25.2.2 2025-10-06
+- Replaced true/false text with intuitive checkboxes for boolean values in the metadata editor, making editing easier and faster;
+- Keyboard navigation was improved across the application. Additional shortcuts are available in the main info panel (top-right corner). To help you discover them faster, relevant keyboard shortcuts are also shown directly in the tooltips of Data Editor buttons;
+- Fixed an issue in the Data Editor where resizing one column in a wide table would cause previously resized columns to revert to their original width. Users can resize multiple columns as intended.

-### 24.3.0. 2024-12-02
-### Changes since 24.2.0:
- General:
-  -    The connections Templates feature is declared obsolete and will be removed in future releases;
-  -    Data export: Added the ability to export JSON values as embedded JSON;
-  -    Fixed a proxy issue that excluded the Content-Type header in responses;
-  -    Data editor enhancements: Rows with focused cells are specially marked to make it easier to locate a position in large tables;
-  -    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;
-  -    Chinese localization has been improved (thanks to @cashlifei);
-  -    Brazilian Portuguese localization was enhanced (thanks to @brlarini).
+### 25.2.1 2025-09-22
+- Autocomplete values in SQL Editor are ordered alphabetically to simplify object search;
+- "Show all databases" setting was added on the connection page for MySQL and MariaDB;
+- Different bug fixes and enhancements have been made.
+
+### 25.2.0 2025-09-01
+### Changes since 25.1.0:
 - Administration:
-  -    Updated user storage mechanism: New user logins are now stored in lowercase to prevent duplicate entries (e.g., "ADMIN" and "admin"). Note: This update does not affect previously created user logins;
-  -    Added an ability to change a user password even if the user is disabled in a system;
-  -    Refreshed design for the User and Teams tab in the Administration panel;
-  -    A new setting in Global Preferences was added to restrict data import for non-admin users;
-  -    A search option was added for preferences in the Administration part;
-  -    Added detailed logging of GraphQL queries in the server logs, including all provided variables, for improved debugging and monitoring;
-  -    Environment variables configuration has been improved - now you can configure more variables on the initial stage of the Docker setup.
- Databases:
-  -    PostgreSQL, Greenplum, CockroachDB: The URL mode now supports connecting to multiple databases;
-  -    PostgreSQL, H2, and SQL Server: Schemas were added to the SQL autocompletion;
-  -    MySQL: CloudBeaver can now correctly display negative dates;
-  -    DuckDB: The issue with displaying BLOB data types has been resolved.
- Drivers:
-  -    A new LibSQL/Turso driver was added;
-  -    SQL Server driver has been updated to version 12.8.0;
-  -    DB2i driver has been updated to version 20.0.7.
+  -    Added support for multiple server URLs to accommodate different access policies for internal and external users, improving flexibility in network-restricted environments. To set it up, use the Allowed Server URLs field in the Server configuration within the Administration section;
+  -    Added the Force HTTPS mode setting in Server Configuration to enforce redirecting from HTTP to HTTPS. This setting helps avoid a potential man-in-the-middle attack. This setting is turned off by default. Please remember to configure your proxy before enabling;
+  -    Added the CLOUDBEAVER_BIND_SESSION_TO_IP option to improve session security by linking user sessions to their IP address. It is disabled by default. When enabled, this helps protect against certain types of session hijacking attacks, where an attacker could try to take over a user’s session. Note: Users will be logged out automatically on the IP address change (switching networks or using mobile data);
+  -    A password confirmation field has been added for administrators in the Easy Config section to prevent accidental misconfigurations.
+- SQL Editor:
+  -    Changed the default engine used for autocompletion in the SQL Editor. This Semantic engine offers improved suggestions for database objects, keywords, and functions. You can switch back to the Legacy engine in Preferences > SQL Editor;
+  -    A “Clear” button was added to the output panel.
+- Data Editor:
+  -    Column descriptions were added in the Data Editor under column names to provide more metadata context. You can disable this in Preferences > Data Viewer;
+  -    Added an ability to review the script before execution when users edit tables without primary keys.
+- General:
+  -    Added a new welcome screen for a freshly opened application. This screen contains shortcuts to create a new connection, open SQL Editor, or documentation;
+  -    Added a search panel for SQL Editor and Value panel: press Ctrl/Cmd + F to open a panel that allows searching and replacing by keyword or regular expression;
+  -    Changed the data transfer mechanism to avoid intermediate file creation. The parameter dataExportFileSizeLimit was removed from the server configuration as deprecated;
+  -    The CloudBeaver default theme matches the device theme by default now. You can change this behavior in user preferences under the Theme section;
+  -    Added the option to display tabs across multiple rows, allowing you to see all tabs without scrolling. You can enable this in Preferences > Interface;
+  -    Improved dark theme accessibility by enhancing color contrast across the app for better readability and compliance with accessibility standards;
+  -    The database navigator now automatically hides empty folders in shared projects, reducing visual clutter and speeding up the process of finding active connections.
+- Databases and drivers:
+  -    Clickhouse: fixed the presentation of tuples and map data types in the Data Editor;
+  -    Databend database support has been added (thanks to @hantmac);
+  -    DuckDB: driver has been updated to version 1.3;
+  -    MySQL: Improved performance when retrieving foreign keys metadata;
+  -    PostgreSQL: fixed misplaced comment for table DDL generation.

 ## Contribution
 As a community-driven open-source project, we warmly welcome contributions through GitHub pull requests. 

 [We are happy to reward](https://dbeaver.com/help-dbeaver/) our most active contributors every major sprint.
-The most significant contribution to our code for the major release 24.3.0 was made by:
-1. [cashlifei](https://github.com/cashlifei)
+The most significant contribution to our code for the major release 25.2.0 was made by:
+1. [hantmac](https://github.com/hantmac) - added support for Databend in CloudBeaver Community Edition.
@@ -1,8 +1,8 @@
 {
    server: {
        serverPort: "${CLOUDBEAVER_WEB_SERVER_PORT:8978}",
+        forceHttps: "${CLOUDBEAVER_FORCE_HTTPS:false}",

-        workspaceLocation: "${CLOUDBEAVER_WORKSPACE_LOCATION:workspace}",
        contentRoot: "web",
        driversLocation: "drivers",

@@ -10,11 +10,12 @@

        rootURI: "${CLOUDBEAVER_ROOT_URI:/}",
        serviceURI: "/api/",
+        supportedHosts: [],

        productSettings: {
            # Global properties
-            core.theming.theme: "${CLOUDBEAVER_CORE_THEMING_THEME:light}",
-            core.localization.localization: "${CLOUDBEAVER_CORE_LOCALIZATION:en}",
+            core.theming.theme: "${CLOUDBEAVER_CORE_THEMING_THEME:system}",
+            core.localization.language: "${CLOUDBEAVER_CORE_LOCALIZATION:en}",
            plugin.sql-editor.autoSave: "${CLOUDBEAVER_SQL_EDITOR_AUTOSAVE:true}",
            plugin.sql-editor.disabled: "${CLOUDBEAVER_SQL_EDITOR_DISABLED:false}",
            # max size of the file that can be uploaded to the editor (in kilobytes)
@@ -22,11 +23,12 @@
            plugin.log-viewer.disabled: "${CLOUDBEAVER_LOG_VIEWER_DISABLED:false}",
            plugin.log-viewer.logBatchSize: "${CLOUDBEAVER_LOG_VIEWER_LOG_BATCH_SIZE:1000}",
            plugin.log-viewer.maxLogRecords: "${CLOUDBEAVER_LOG_VIEWER_MAX_LOG_RECORDS:2000}",
-            sql.proposals.insert.table.alias: "${CLOUDBEAVER_SQL_PROPOSALS_INSERT_TABLE_ALIAS:PLAIN}"
+            sql.proposals.insert.table.alias: "${CLOUDBEAVER_SQL_PROPOSALS_INSERT_TABLE_ALIAS:PLAIN}",
+            SQLEditor.ContentAssistant.experimental.mode: "${CLOUDBEAVER_SQL_EDITOR_CONTENT_ASSISTANT_EXPERIMENTAL_MODE:NEW}"
        },

        expireSessionAfterPeriod: "${CLOUDBEAVER_EXPIRE_SESSION_AFTER_PERIOD:1800000}",
-
+        bindSessionToIp: "${CLOUDBEAVER_BIND_SESSION_TO_IP:disable}",
        develMode: "${CLOUDBEAVER_DEVEL_MODE:false}",

        enableSecurityManager: false,
@@ -78,7 +80,6 @@
        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}",
@@ -89,12 +90,6 @@
            "local"
        ],

-        disabledDrivers: [
-            "sqlite:sqlite_jdbc",
-            "h2:h2_embedded",
-            "h2:h2_embedded_v2",
-            "clickhouse:yandex_clickhouse"
-        ],
        disabledBetaFeatures: [

        ]
@@ -3,11 +3,11 @@ set -Eeuo pipefail

 echo "Build static content"

-mkdir ./cloudbeaver/web
+mkdir -p ./cloudbeaver/web

 cd ../../cloudbeaver/webapp

-yarn
+yarn install --immutable
 cd ./packages/product-default
 yarn run bundle

@@ -28,4 +28,4 @@ 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-cloudbeaver-server.sh in cloudbeaver folder to start the server."
@@ -72,6 +72,6 @@ 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-cloudbeaver-server.bat in cloudbeaver folder to start the server."

 pause
@@ -5,11 +5,11 @@ MAINTAINER DBeaver Corp, devops@dbeaver.com
 ENV DEBIAN_FRONTEND=noninteractive

 RUN set -eux; \
-    apt-get update; \
+    apt-get update && \
+    apt-get dist-upgrade -y --no-install-recommends && \
    apt-get install -y --no-install-recommends \
        # curl required for historical reasons, see https://github.com/adoptium/containers/issues/255
        curl \
-        wget \
        # java.lang.UnsatisfiedLinkError: libfontmanager.so: libfreetype.so.6: cannot open shared object file: No such file or directory
        # java.lang.NoClassDefFoundError: Could not initialize class sun.awt.X11FontManager
        # https://github.com/docker-library/openjdk/pull/235#issuecomment-424466077
@@ -1,13 +1,11 @@
-FROM dbeaver/base-java
+ARG BASE_JAVA_TAG="stable"
+FROM dbeaver/base-java:${BASE_JAVA_TAG}

 MAINTAINER DBeaver Corp, devops@dbeaver.com

 ENV DBEAVER_GID=8978
 ENV DBEAVER_UID=8978

-RUN apt-get update && \
-    apt-get upgrade -y
-
 RUN groupadd -g $DBEAVER_GID dbeaver && \
    useradd -g $DBEAVER_GID -m -u $DBEAVER_UID -s /bin/bash dbeaver

@@ -18,6 +16,6 @@ EXPOSE 8978
 RUN find /opt/cloudbeaver -type d -exec chmod 775 {} \;
 WORKDIR /opt/cloudbeaver/

-RUN chmod +x "run-server.sh" "/opt/cloudbeaver/launch-product.sh"
+RUN chmod +x "run-cloudbeaver-server.sh" "/opt/cloudbeaver/launch-product.sh"

 ENTRYPOINT ["./launch-product.sh"]
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -Eeo pipefail
+if [[ $# -eq 0 ]] ;
+  then
+    set -- "$@" -help
+fi
+set -- "$@" -cli-mode
+
+source run-cloudbeaver-server.sh "$@"
@@ -11,9 +11,9 @@ if [ "$(id -u)" -eq 0 ]; then
    TARGET_UID=${TARGET_UID:-$DBEAVER_UID}
    TARGET_GID=${TARGET_GID:-$DBEAVER_GID}

-    chown -R $DBEAVER_UID:$DBEAVER_GID $PWD
-    # Execute run-server.sh as the dbeaver user with the JAVA_HOME and PATH environment variables
-    exec su "$TARGET_USER" -c "JAVA_HOME=$JAVA_HOME PATH=$PATH ./run-server.sh"
+    chown -R $DBEAVER_UID:$DBEAVER_GID $PWD/workspace
+    # Execute run-cloudbeaver-server.sh as the dbeaver user with the JAVA_HOME and PATH environment variables
+    exec su "$TARGET_USER" -c "JAVA_HOME=$JAVA_HOME PATH=$PATH ./run-cloudbeaver-server.sh"
 else
-    exec ./run-server.sh
+    exec ./run-cloudbeaver-server.sh
 fi
@@ -17,7 +17,7 @@ If Not Defined JAVA_OPTS (

 java %JAVA_OPTS% ^
    -Dfile.encoding=UTF-8 ^
-    --add-modules=ALL-SYSTEM ^
+    --add-modules=ALL-DEFAULT ^
    --add-opens=java.base/java.io=ALL-UNNAMED ^
    --add-opens=java.base/java.lang=ALL-UNNAMED ^
    --add-opens=java.base/java.lang.reflect=ALL-UNNAMED ^
@@ -11,7 +11,7 @@ echo "Starting Cloudbeaver Server"

 exec java ${JAVA_OPTS} \
  -Dfile.encoding=UTF-8 \
-  --add-modules=ALL-SYSTEM \
+  --add-modules=ALL-DEFAULT \
  --add-opens=java.base/java.io=ALL-UNNAMED \
  --add-opens=java.base/java.lang=ALL-UNNAMED \
  --add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
@@ -36,5 +36,6 @@ exec java ${JAVA_OPTS} \
  -jar ${launcherJar} \
  -product io.cloudbeaver.product.ce.product \
  -web-config conf/cloudbeaver.conf \
+  "$@" \
  -nl en \
  -registryMultiLanguage
@@ -1,3 +1,2 @@
-SET mypath=%~dp0
-
-.\..\idea-rcp-launch-config-generator\runGenerator.cmd -f %mypath%
+@echo off
+%~dp0\..\idea-rcp-launch-config-generator\runGenerator.cmd -f %~dp0
@@ -1 +1,6 @@
-./../idea-rcp-launch-config-generator/runGenerator.sh -f "$PWD"
+#!/usr/bin/env sh
+
+script_dir="$(realpath "$(dirname "$0")")"
+repositories_root_dir="$(realpath "$script_dir/..")"
+
+"$repositories_root_dir"/idea-rcp-launch-config-generator/runGenerator.sh "$script_dir"
@@ -0,0 +1,15 @@
+lefthook: |
+  cd webapp
+  yarn dlx --quiet lefthook
+output: false
+pre-commit:
+  commands:
+    check-license:
+      skip:
+        - merge
+        - rebase
+      root: webapp
+      glob: "*.{ts,tsx}"
+      exclude:
+        - "**/locales/**"
+      run: yarn core-cli-check-license {staged_files}
@@ -16,7 +16,7 @@ testLibraries=\
  org.hamcrest.core;\
  org.hamcrest
 repositories=\
-  https://p2.dev.dbeaver.com/eclipse-repo/;\
+  https://repo.dbeaver.net/p2/ce/latest/;\
  https://download.eclipse.org/releases/${eclipse-version}/;
 testBundles=\
  org.junit;\
@@ -26,7 +26,7 @@ testBundles=\
 productsPaths=\
  dbeaver/product/community/DBeaver.product;\
  cloudbeaver/server/product/web-server/CloudbeaverServer.product:../../opt/cloudbeaver;\
-  cloudbeaver/server/product/web-server-test/CloudbeaverServerTest.product:../../opt/cloudbeaver;
+  cloudbeaver/server/product/web-server-test/CloudbeaverServerUnitTest.product:../../opt/cloudbeaver;
 ideaConfigurationFilesPaths=\
  dbeaver/.ide/.idea;
 additionalModuleRoots=\
@@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2
 Bundle-Vendor: DBeaver Corp
 Bundle-Name: Cloudbeaver Web Model
 Bundle-SymbolicName: io.cloudbeaver.model;singleton:=true
-Bundle-Version: 1.0.70.qualifier
-Bundle-Release-Date: 20250203
-Bundle-RequiredExecutionEnvironment: JavaSE-17
+Bundle-Version: 1.0.88.qualifier
+Bundle-Release-Date: 20251103
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: .
 Require-Bundle: org.jkiss.dbeaver.data.gis;visibility:=reexport,
 org.jkiss.dbeaver.model;visibility:=reexport,
+ org.jkiss.dbeaver.model.cli;visibility:=reexport,
 org.jkiss.dbeaver.model.sm;visibility:=reexport,
 org.jkiss.dbeaver.model.event;visibility:=reexport,
 org.jkiss.dbeaver.model.nio;visibility:=reexport,
 org.jkiss.dbeaver.registry;visibility:=reexport,
 org.jkiss.dbeaver.net.ssh,
- org.jkiss.bundle.graphql.java;visibility:=reexport,
+ org.jkiss.bundle.graphql;visibility:=reexport,
 org.jkiss.bundle.apache.dbcp,
 com.google.gson;visibility:=reexport,
 jakarta.servlet-api;bundle-version:="6.0.0";visibility:=reexport
@@ -29,6 +29,9 @@ Export-Package: io.cloudbeaver,
 io.cloudbeaver.model,
 io.cloudbeaver.model.app,
 io.cloudbeaver.model.config,
+ io.cloudbeaver.model.apilog,
+ io.cloudbeaver.model.cli,
+ io.cloudbeaver.model.events,
 io.cloudbeaver.model.fs,
 io.cloudbeaver.model.log,
 io.cloudbeaver.model.rm,
@@ -39,6 +42,7 @@ Export-Package: io.cloudbeaver,
 io.cloudbeaver.model.utils,
 io.cloudbeaver.registry,
 io.cloudbeaver.server,
+ io.cloudbeaver.server.filters,
 io.cloudbeaver.service,
 io.cloudbeaver.service.admin,
 io.cloudbeaver.service.security,
@@ -0,0 +1,19 @@
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.osInfo.name=OS
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.memoryAvailable.name=Memory available
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.javaVersion.name=Java version
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.javaParameters.name=JVM parameters
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.productName.name=Product name
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.productVersion.name=Product version
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.workspacePath.name=Workspace path
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.installPath.name=Install path
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.deploymentType.name=Deployment type
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbUrl.name=Security manager database URL
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbDriverName.name=Security manager database driver name
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbProductName.name=Security manager database product name
+meta.io.cloudbeaver.model.app.ServletSystemInformationCollector.smDbProductVersion.name=Security manager database product version
+
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Read-only connection
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Auto-commit
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Keep-alive interval (seconds)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultSchema.name = Default schema
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultCatalog.name = Default catalog
@@ -0,0 +1,2 @@
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Garder actif (en secondes)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = Pas de déconnexion automatique
@@ -0,0 +1,5 @@
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Только для чтения
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Авто-коммит
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Интервал Keep-alive (в секундах)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultSchema.name = Схема по умолчанию
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.defaultCatalog.name = Каталог по умолчанию
@@ -0,0 +1,4 @@
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.readOnly.name = Kết nối chỉ đọc
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = Tự động commit
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = Giữ kết nối (tính bằng giây)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = Không tự động ngắt kết nối
@@ -0,0 +1,3 @@
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.autoCommit.name = 自动提交
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.name = 保持连接 (秒)
+meta.io.cloudbeaver.model.WebExpertSettingsProperties.keepAliveInterval.description = 无自动断开连接
@@ -2,5 +2,6 @@ source.. = src/
 output.. = target/classes/
 bin.includes = .,\
    META-INF/,\
+    OSGI-INF/,\
    plugin.xml,\
    schema/
@@ -10,7 +10,7 @@
         <relativePath>../</relativePath>
    </parent>
    <artifactId>io.cloudbeaver.model</artifactId>
-    <version>1.0.70-SNAPSHOT</version>
+    <version>1.0.88-SNAPSHOT</version>
    <packaging>eclipse-plugin</packaging>

 </project>
@@ -17,17 +17,14 @@
 package io.cloudbeaver;

 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.DBException;
 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.utils.CommonUtils;
-import org.jkiss.utils.Pair;
+import org.jkiss.dbeaver.model.rm.*;

 import java.nio.file.Path;
-import java.util.Collection;

 public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMControllerProvider {

@@ -80,6 +77,12 @@ public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMCo
        return project.getId();
    }

+    @NotNull
+    @Override
+    public String getDisplayName() {
+        return getName();
+    }
+
    @NotNull
    @Override
    public Path getAbsolutePath() {
@@ -101,47 +104,25 @@ public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMCo
        return false;
    }

-    /**
-     * Method for Bulk Update of resources properties paths
-     *
-     * @param oldToNewPaths collection of OldPath to NewPath pairs
-     */
-    public void moveResourcePropertiesBatch(@NotNull Collection<Pair<String, String>> oldToNewPaths) {
-        loadMetadata();
-        synchronized (metadataSync) {
-            for (var pathsPair : oldToNewPaths) {
-                final var oldResourcePath = CommonUtils.normalizeResourcePath(pathsPair.getFirst());
-                final var newResourcePath = CommonUtils.normalizeResourcePath(pathsPair.getSecond());
-                final var resProps = resourceProperties.remove(oldResourcePath);
-                if (resProps != null) {
-                    resourceProperties.put(newResourcePath, resProps);
-                }
-            }
-        }
-        flushMetadata();
+    @Override
+    public boolean isPrivateProject() {
+        return RMProjectType.USER.equals(getRMProject().getType());
    }

-    /**
-     * Method for Bulk Remove of resources properties
-     */
-    public boolean resetResourcesPropertiesBatch(@NotNull Collection<String> resourcesPaths) {
-        loadMetadata();
-        boolean propertiesChanged = false;
-        synchronized (metadataSync) {
-            for (var resourcePath : resourcesPaths) {
-                var removedProperties = resourceProperties.remove(CommonUtils.normalizeResourcePath(resourcePath));
-                if (removedProperties != null) {
-                    propertiesChanged = true;
-                }
-            }
-        }
-        if (propertiesChanged) {
-            flushMetadata();
-        }
-        return propertiesChanged;
+    @Override
+    public void updateProject(@Nullable String newName, @Nullable String description) throws DBException {
+        RMProject rmProject = getResourceController().updateProject(this.getId(), new RMProjectInfo(newName, description));
+        updateProjectInfo(rmProject.getName(), rmProject.getDescription());
    }

-    public Path getMetadataFilePath() {
-        return getMetadataPath().resolve(METADATA_STORAGE_FILE);
+    public void updateProjectInfo(@Nullable String newName, @Nullable String description) {
+        this.project.setName(newName);
+        this.project.setDescription(description);
+        RMEventManager.fireEvent(
+            new RMEvent(
+                RMEvent.Action.PROJECT_UPDATE,
+                project
+            )
+        );
    }
 }
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -29,7 +29,14 @@ public interface DBWConstants {
    String PERMISSION_CONFIGURATION_MANAGER = RMConstants.PERMISSION_CONFIGURATION_MANAGER;
    String PERMISSION_PRIVATE_PROJECT_ACCESS = "private-project-access";
    String PERMISSION_SECRET_MANAGER = "secret-manager";
+    String PERMISSION_SQL_RESULT_UPDATE = "sql-result-update";
+    String PERMISSION_SQL_EXECUTE_QUERY = "sql-execute-query";

+    String PERMISSION_FS_RESOURCE_EDIT = "fs-resource-edit";
+
+    String GLOBAL_PERMISSION_SCRIPT_EXECUTE = "permission.sql.script.execution";
+    String GLOBAL_PERMISSION_DATA_EDITOR_IMPORT = "permission.data-editor.import";
+    String GLOBAL_PERMISSION_DATA_EDITOR_EDITING = "permission.data-editor.editing";

    String PERMISSION_EDIT_STRUCTURE = "edit-meta";
    String PERMISSION_EDIT_DATA = "edit-data";
@@ -41,7 +48,7 @@ public interface DBWConstants {
        GLOBAL,
        EMBEDDED
    }
-
+    String TASK_STATUS_FINISHED = "Finished";
    //public static final String PERMISSION_USER = "user";

 }
@@ -36,4 +36,6 @@ public interface DBWFeatureSet {

    boolean isEnabled();

+    boolean isEnabledByDefault();
+
 }
@@ -0,0 +1,110 @@
+/*
+ * 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.WebConnectionConfig;
+import io.cloudbeaver.model.app.WebAppConfiguration;
+import io.cloudbeaver.utils.ServletAppUtils;
+import io.cloudbeaver.utils.WebDataSourceUtils;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
+import org.jkiss.dbeaver.model.connection.DBPConnectionConfiguration;
+import org.jkiss.dbeaver.model.connection.DBPDriver;
+import org.jkiss.dbeaver.registry.DataSourceDescriptor;
+import org.jkiss.utils.CommonUtils;
+
+public class WebConnectionConfigInputHandler<T extends WebConnectionConfig, C extends DataSourceDescriptor> {
+    private static final Log log = Log.getLog(WebConnectionConfigInputHandler.class);
+    protected final T input;
+    protected final DBPDataSourceRegistry registry;
+
+    public WebConnectionConfigInputHandler(@NotNull DBPDataSourceRegistry registry, T configInput) {
+        this.registry = registry;
+        this.input = configInput;
+    }
+
+    public C createDataSourceContainer() throws DBWebException {
+        String driverId = input.getDriverId();
+        if (CommonUtils.isEmpty(driverId)) {
+            throw new DBWebException("Driver must be specified");
+        }
+        DBPDriver driver = WebDataSourceUtils.getDriverById(driverId);
+
+        C newDataSource = createDataSourceContainerFromInput(driver);
+
+        if (ServletAppUtils.getServletApplication().getAppConfiguration() instanceof WebAppConfiguration webAppConfiguration) {
+            newDataSource.setNavigatorSettings(webAppConfiguration.getDefaultNavigatorSettings());
+        }
+
+        WebDataSourceUtils.saveAuthProperties(
+            newDataSource,
+            newDataSource.getConnectionConfiguration(),
+            input.getCredentials(),
+            input.isSaveCredentials(),
+            input.isSharedCredentials()
+        );
+        return newDataSource;
+    }
+
+    public void updateDataSource(@NotNull C dataSource) throws DBWebException {
+        dataSource.setId(dataSource.getId());
+        if (!CommonUtils.isEmpty(input.getName())) {
+            dataSource.setName(input.getName());
+        }
+
+        if (input.getDescription() != null) {
+            dataSource.setDescription(input.getDescription());
+        }
+
+        dataSource.setFolder(input.getFolder() != null ? registry.getFolder(input.getFolder()) : null);
+        if (input.isDefaultAutoCommit() != null) {
+            dataSource.setDefaultAutoCommit(input.isDefaultAutoCommit());
+        }
+        WebDataSourceUtils.setConnectionConfiguration(
+            dataSource.getDriver(),
+            dataSource.getConnectionConfiguration(),
+            input
+        );
+        WebDataSourceUtils.saveAuthProperties(
+            dataSource,
+            dataSource.getConnectionConfiguration(),
+            input.getCredentials(),
+            input.isSaveCredentials(),
+            input.isSharedCredentials()
+        );
+        dataSource.setConnectionReadOnly(input.isReadOnly());
+    }
+
+    @NotNull
+    protected C createDataSourceContainerFromInput(@NotNull DBPDriver driver) {
+        DBPConnectionConfiguration dsConfig = new DBPConnectionConfiguration();
+        WebDataSourceUtils.setConnectionConfiguration(driver, dsConfig, input);
+        C newDataSource = registry.createDataSource(driver, dsConfig);
+
+        newDataSource.setSavePassword(true);
+        newDataSource.setName(CommonUtils.notNull(input.getName(), "NewConnection"));
+        newDataSource.setDescription(input.getDescription());
+        newDataSource.setConnectionReadOnly(input.isReadOnly());
+        if (input.getFolder() != null) {
+            newDataSource.setFolder(registry.getFolder(input.getFolder()));
+        }
+        return newDataSource;
+    }
+
+
+}
@@ -0,0 +1,55 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver;
+
+import io.cloudbeaver.model.session.WebSession;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.DBPDataSourceContainer;
+import org.jkiss.dbeaver.model.DBPEvent;
+import org.jkiss.dbeaver.model.DBPEventListener;
+import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceConnectEvent;
+
+/**
+ * Sends a WebSocket event when a data source is connected.
+ */
+public class WebDataSourceConnectEventListener implements DBPEventListener {
+
+    @NotNull
+    private final WebSession webSession;
+
+    public WebDataSourceConnectEventListener(@NotNull WebSession webSession) {
+        this.webSession = webSession;
+    }
+
+    @Override
+    public void handleDataSourceEvent(@NotNull DBPEvent event) {
+        if (!(event.getObject() instanceof DBPDataSourceContainer container)) {
+            return;
+        }
+
+        if (event.getAction() == DBPEvent.Action.AFTER_CONNECT && event.getEnabled()) {
+            webSession.addSessionEvent(
+                new WSDataSourceConnectEvent(
+                    container.getProject().getId(),
+                    container.getId(),
+                    webSession.getSessionId(),
+                    webSession.getUserId()
+                )
+            );
+        }
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@

 package io.cloudbeaver;

+import io.cloudbeaver.model.session.WebSession;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
@@ -34,22 +35,32 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.secret.DBSSecretController;
 import org.jkiss.dbeaver.model.struct.DBSObjectFilter;
 import org.jkiss.dbeaver.registry.DataSourceConfigurationManager;
+import org.jkiss.dbeaver.registry.DataSourceParseResults;
 import org.jkiss.dbeaver.registry.DataSourcePersistentRegistry;
 import org.jkiss.dbeaver.registry.DataSourceRegistry;

-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;

-public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSourcePersistentRegistry, DBPDataSourceRegistryCache {
+/**
+ * Proxy for a global project data source registry.
+ * We need to filter some data sources in case of inaccessibility (not enough permissions).
+ */
+public class WebGlobalProjectRegistryProxy implements DBPDataSourceRegistry, DataSourcePersistentRegistry, DBPDataSourceRegistryCache {
+    @NotNull
+    private final WebSession webSession;
    @NotNull
    private final DataSourceFilter dataSourceFilter;
    @NotNull
    private final DataSourceRegistry<?> dataSourceRegistry;

-    public WebDataSourceRegistryProxy(@NotNull DataSourceRegistry<?> dataSourceRegistry, @NotNull DataSourceFilter filter) {
+    public WebGlobalProjectRegistryProxy(
+        @NotNull WebSession webSession,
+        @NotNull DataSourceRegistry<?> dataSourceRegistry,
+        @NotNull DataSourceFilter filter
+    ) {
+        this.webSession = webSession;
        this.dataSourceRegistry = dataSourceRegistry;
        this.dataSourceFilter = filter;
    }
@@ -141,7 +152,7 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo

    @Override
    public void addDataSourceListener(@NotNull DBPEventListener listener) {
-        dataSourceRegistry.addDataSourceListener(listener);
+        dataSourceRegistry.addDataSourceListener(new WebDBPEventListenerProxy(listener));
    }

    @Override
@@ -177,13 +188,30 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
    @NotNull
    @Override
    public List<? extends DBPDataSourceFolder> getAllFolders() {
-        return dataSourceRegistry.getAllFolders();
+        if (webSession.hasPermission(DBWConstants.PERMISSION_ADMIN)) {
+            return dataSourceRegistry.getAllFolders();
+        }
+        Set<DBPDataSourceFolder> set = new LinkedHashSet<>();
+        for (DBPDataSourceContainer container : getDataSources()) {
+            DBPDataSourceFolder folder = container.getFolder();
+            while (folder != null) {
+                set.add(folder);
+                folder = folder.getParent();
+            }
+        }
+        return new ArrayList<>(set);
    }

    @NotNull
    @Override
    public List<? extends DBPDataSourceFolder> getRootFolders() {
-        return dataSourceRegistry.getRootFolders();
+        if (webSession.hasPermission(DBWConstants.PERMISSION_ADMIN)) {
+            return dataSourceRegistry.getRootFolders();
+        }
+        return getDataSources().stream()
+            .map(DBPDataSourceContainer::getFolder)
+            .filter(folder -> folder != null && folder.getParent() == null)
+            .toList();
    }

    @NotNull
@@ -204,7 +232,7 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
    }

    @Override
-    public void moveFolder(@NotNull String oldPath, @NotNull String newPath) {
+    public void moveFolder(@NotNull String oldPath, @NotNull String newPath) throws DBException {
        dataSourceRegistry.moveFolder(oldPath, newPath);
    }

@@ -350,7 +378,7 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
    }

    @Override
-    public boolean loadDataSources(
+    public DataSourceParseResults loadDataSources(
        @NotNull List<DBPDataSourceConfigurationStorage> storages,
        @NotNull DataSourceConfigurationManager manager,
        @Nullable Collection<String> dataSourceIds, boolean refresh,
@@ -387,4 +415,29 @@ public class WebDataSourceRegistryProxy implements DBPDataSourceRegistry, DataSo
    public void resolveSecrets(DBSSecretController secretController) throws DBException {
        dataSourceRegistry.resolveSecrets(secretController);
    }
+
+    /**
+     * Event listener proxy.
+     * For some cases (like creating data source) we should not send event because of accessibility of connection.
+     */
+    private class WebDBPEventListenerProxy implements DBPEventListener {
+        @NotNull
+        private final DBPEventListener eventListener;
+
+        public WebDBPEventListenerProxy(@NotNull DBPEventListener eventListener) {
+            this.eventListener = eventListener;
+        }
+
+        @Override
+        public void handleDataSourceEvent(@NotNull DBPEvent event) {
+            if (event.getAction() == DBPEvent.Action.OBJECT_ADD &&
+                event.getObject() instanceof DBPDataSourceContainer container &&
+                !dataSourceFilter.filter(container)
+            ) {
+                // we cannot send event of creating data source connection because it is not accessible for user
+                return;
+            }
+            eventListener.handleDataSourceEvent(event);
+        }
+    }
 }
@@ -49,7 +49,8 @@ public class WebSessionGlobalProjectImpl extends WebSessionProjectImpl {
    @NotNull
    @Override
    protected DBPDataSourceRegistry createDataSourceRegistry() {
-        return new WebDataSourceRegistryProxy(
+        return new WebGlobalProjectRegistryProxy(
+            webSession,
            createRegistryWithCredentialsProvider(),
            this::isDataSourceAccessible
        );
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,11 +16,13 @@
 */
 package io.cloudbeaver;

+import io.cloudbeaver.model.WebConnectionConfig;
 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.DBException;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.model.DBPDataSourceContainer;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
@@ -28,20 +30,26 @@ 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.security.SMObjectType;
 import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceEvent;
+import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
 import org.jkiss.dbeaver.registry.DataSourceRegistry;
 import org.jkiss.dbeaver.runtime.jobs.DisconnectJob;
+import org.jkiss.utils.CommonUtils;

 import java.nio.file.Path;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;

 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 final Map<String, Object> projectSettings = new ConcurrentHashMap<>();
    private boolean registryIsLoaded = false;

    public WebSessionProjectImpl(
@@ -91,6 +99,7 @@ public class WebSessionProjectImpl extends WebProjectImpl {
    protected DataSourceRegistry<?> createRegistryWithCredentialsProvider() {
        DataSourceRegistry<?> dataSourceRegistry = createRMRegistry();
        dataSourceRegistry.setAuthCredentialsProvider(webSession);
+        dataSourceRegistry.addDataSourceListener(webSession.getDataSourceConnectListener());
        return dataSourceRegistry;
    }

@@ -156,7 +165,7 @@ public class WebSessionProjectImpl extends WebProjectImpl {
     */
    @NotNull
    public synchronized WebConnectionInfo addConnection(@NotNull DBPDataSourceContainer dataSourceContainer) {
-        WebConnectionInfo connection = new WebConnectionInfo(webSession, dataSourceContainer);
+        WebConnectionInfo connection = createConnectionInfo(dataSourceContainer);
        synchronized (connections) {
            connections.put(dataSourceContainer.getId(), connection);
        }
@@ -194,35 +203,32 @@ public class WebSessionProjectImpl extends WebProjectImpl {
    /**
     * updates data sources based on event in web session
     *
-     * @param dataSourceIds list of updated connections
-     * @param eventId  id of event
+     * @param event data source updated event
     */
-    public synchronized boolean updateProjectDataSources(@NotNull List<String> dataSourceIds, @NotNull String eventId) {
+    public synchronized boolean updateProjectDataSources(@NotNull WSDataSourceEvent event) {
        var sendDataSourceUpdatedEvent = false;
        DBPDataSourceRegistry registry = getDataSourceRegistry();
-        // save old connections
-        var oldDataSources = dataSourceIds.stream()
-            .map(registry::getDataSource)
-            .filter(Objects::nonNull)
-            .collect(Collectors.toMap(
-                DBPDataSourceContainer::getId,
-                Function.identity())
-            );
-        if (WSDataSourceEvent.CREATED.equals(eventId) || WSDataSourceEvent.UPDATED.equals(eventId)) {
-            registry.refreshConfig(dataSourceIds);
+        if (WSDataSourceEvent.CREATED.equals(event.getId()) || WSDataSourceEvent.UPDATED.equals(event.getId())) {
+            registry.refreshConfig(event.getDataSourceIds());
        }
-        for (String dsId : dataSourceIds) {
+        for (String dsId : event.getDataSourceIds()) {
            DataSourceDescriptor ds = (DataSourceDescriptor) registry.getDataSource(dsId);
            if (ds == null) {
                continue;
            }
-            switch (eventId) {
+            switch (event.getId()) {
                case WSDataSourceEvent.CREATED -> {
                    addConnection(ds);
                    sendDataSourceUpdatedEvent = true;
                }
-                case WSDataSourceEvent.UPDATED -> // if settings were changed we need to send event
-                    sendDataSourceUpdatedEvent |= !ds.equalSettings(oldDataSources.get(dsId));
+                case WSDataSourceEvent.UPDATED ->  {
+                    if (event.getProperty() == WSDataSourceProperty.CONFIGURATION) {
+                        WebDataSourceUtils.disconnectDataSource(webSession, ds);
+                    }
+                    if (event.getProperty() != WSDataSourceProperty.INTERNAL) {
+                        sendDataSourceUpdatedEvent = true;
+                    }
+                }
                case WSDataSourceEvent.DELETED -> {
                    WebDataSourceUtils.disconnectDataSource(webSession, ds);
                    if (registry instanceof DBPDataSourceRegistryCache dsrc) {
@@ -237,4 +243,124 @@ public class WebSessionProjectImpl extends WebProjectImpl {
        }
        return sendDataSourceUpdatedEvent;
    }
+
+    public void refreshProjectSettings() throws DBException {
+        if (webSession.getUser() == null) {
+            projectSettings.clear();
+            return;
+        }
+        Map<String, Object> loadedSettings = webSession.getSecurityController().getObjectSettings(
+            getId(),
+            SMObjectType.project,
+            null
+        );
+        projectSettings.clear();
+        projectSettings.putAll(loadedSettings);
+    }
+
+    @NotNull
+    public WebConnectionInfo createConnectionInfo(@NotNull DBPDataSourceContainer dataSourceDescriptor) {
+        return new WebConnectionInfo(webSession, dataSourceDescriptor);
+    }
+
+    @NotNull
+    public WebConnectionInfo createConnection(@NotNull Map<String, Object> configMap) throws DBWebException {
+        if (CommonUtils.isEmpty(configMap)) {
+            throw new DBWebException("Connection configuration parameters are missing");
+        }
+        DBPDataSourceContainer newDataSource = getDataSourceContainerFromInput(configMap);
+        return addDataSourceToProject(newDataSource);
+    }
+
+    @NotNull
+    public WebConnectionInfo addDataSourceToProject(@NotNull DBPDataSourceContainer newDataSource) throws DBWebException {
+        DBPDataSourceRegistry registry = getDataSourceRegistry();
+        try {
+            registry.addDataSource(newDataSource);
+            registry.checkForErrors();
+        } catch (DBException e) {
+            registry.removeDataSource(newDataSource);
+            throw new DBWebException("Failed to create connection", e);
+        }
+
+        WebConnectionInfo connectionInfo = addConnection(newDataSource);
+        webSession.addInfoMessage("New connection was created - " + WebDataSourceUtils.getConnectionContainerInfo(
+            newDataSource));
+        log.info(String.format(
+            "New connection was created: [info=%s, user=%s]",
+            WebDataSourceUtils.getConnectionContainerInfo(newDataSource),
+            webSession.getUserId()
+        ));
+        return connectionInfo;
+    }
+
+    @NotNull
+    public WebConnectionInfo updateConnection(@Nullable Map<String, Object> configMap) throws DBWebException {
+        WebConnectionConfig config = getConnectionConfigInput(configMap);
+        WebConnectionInfo connectionInfo = getWebConnectionInfo(config.getConnectionId());
+        DataSourceDescriptor dataSource = (DataSourceDescriptor) connectionInfo.getDataSourceContainer();
+        webSession.addInfoMessage("Update connection - " + WebDataSourceUtils.getConnectionContainerInfo(dataSource));
+
+        DBPDataSourceRegistry registry = getDataSourceRegistry();
+        getInputConfigHandler(configMap).updateDataSource(dataSource);
+        connectionInfo.setCredentialsSavedInSession(null);
+        try {
+            registry.updateDataSource(dataSource);
+            registry.checkForErrors();
+        } catch (DBException e) {
+            throw new DBWebException("Failed to update connection", e);
+        }
+        return connectionInfo;
+    }
+
+    public boolean deleteConnection(@NotNull String connectionId) throws DBWebException {
+        WebConnectionInfo connectionInfo = getWebConnectionInfo(connectionId);
+        webSession.addInfoMessage("Delete connection - " +
+            WebDataSourceUtils.getConnectionContainerInfo(connectionInfo.getDataSourceContainer()));
+        closeAndDeleteConnection(connectionInfo);
+
+        log.info(String.format(
+            "Connection deleted: [info=%s, userId=%s]",
+            WebDataSourceUtils.getConnectionContainerInfo(connectionInfo.getDataSourceContainer()),
+            webSession.getUserId()
+        ));
+        return true;
+    }
+
+    @NotNull
+    private WebConnectionInfo closeAndDeleteConnection(@NotNull WebConnectionInfo connectionInfo) throws DBWebException {
+        DBPDataSourceContainer dataSourceContainer = connectionInfo.getDataSourceContainer();
+        boolean disconnected = WebDataSourceUtils.disconnectDataSource(webSession, dataSourceContainer);
+        DBPDataSourceRegistry registry = getDataSourceRegistry();
+        registry.removeDataSource(dataSourceContainer);
+        try {
+            registry.checkForErrors();
+        } catch (DBException e) {
+            try {
+                registry.addDataSource(dataSourceContainer);
+            } catch (DBException ex) {
+                log.error("Error re-adding after delete attempt", e);
+            }
+            throw new DBWebException("Failed to delete connection", e);
+        }
+        removeConnection(dataSourceContainer);
+        return connectionInfo;
+    }
+
+    @NotNull
+    public DataSourceDescriptor getDataSourceContainerFromInput(@NotNull Map<String, Object> configMap) throws DBWebException {
+        return getInputConfigHandler(configMap).createDataSourceContainer();
+    }
+
+    @NotNull
+    public WebConnectionConfig getConnectionConfigInput(@Nullable Map<String, Object> configMap) {
+        return new WebConnectionConfig(configMap == null ? Map.of() : configMap);
+    }
+
+    @NotNull
+    protected WebConnectionConfigInputHandler getInputConfigHandler(@NotNull Map<String, Object> configMap) {
+        return new WebConnectionConfigInputHandler<>(getDataSourceRegistry(), getConnectionConfigInput(configMap));
+    }
+
+
 }
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 package io.cloudbeaver.auth;

 import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 import org.jkiss.dbeaver.model.security.SMAuthProviderCustomConfiguration;
@@ -36,6 +37,7 @@ public interface SMAuthProviderAssigner {
        @NotNull Map<String, Object> authParameters
    ) throws DBException;

+    @Nullable
    String getExternalTeamIdMetadataFieldName();

 }
@@ -69,4 +69,9 @@ public interface SMAuthProviderExternal<AUTH_SESSION extends SMSession> extends
        @NotNull WebUser user,
        boolean selfIdentity) throws DBException;

+    /**
+     * Make some post authentication actions
+     */
+    default void postAuthentication() {}
+
 }
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -30,27 +30,50 @@ import java.util.Map;
 public interface SMAuthProviderFederated extends SMSignOutLinkProvider {

    @NotNull
-    String getSignInLink(String id) throws DBException;
+    String getSignInLink(@NotNull String id, @NotNull String origin) throws DBException;

    @Override
    default String getUserSignOutLink(
        @NotNull SMAuthProviderCustomConfiguration providerConfig,
-        @NotNull Map<String, Object> userCredentials
+        @NotNull Map<String, Object> userCredentials,
+        @NotNull String origin
    ) throws DBException {
-        return getCommonSignOutLink(providerConfig.getId(), providerConfig.getParameters());
+        return getCommonSignOutLink(providerConfig.getId(), providerConfig.getParameters(), origin);
    }

    @Nullable
-    String getMetadataLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
+    default String getMetadataLink(
+        @NotNull String providerId,
+        @NotNull Map<String, Object> providerConfig,
+        @NotNull String origin
+    ) throws DBException {
+        return null;
+    }

    @Nullable
-    String getAcsLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
+    default String getAcsLink(
+        @NotNull String providerId,
+        @NotNull Map<String, Object> providerConfig,
+        @NotNull String origin
+    ) throws DBException {
+        return null;
+    }

    @Nullable
-    String getEntityIdLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException;
+    default String getEntityIdLink(
+        @NotNull String providerId,
+        @NotNull Map<String, Object> providerConfig,
+        @NotNull String origin
+    ) throws DBException {
+        return null;
+    }

    @Nullable
-    default String getRedirectLink(String id, @NotNull Map<String, Object> providerConfig) throws DBException {
+    default String getRedirectLink(
+        @NotNull String providerId,
+        @NotNull Map<String, Object> providerConfig,
+        @NotNull String origin
+    ) throws DBException {
        return null;
    }

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

 package io.cloudbeaver.auth;

+import org.jkiss.code.Nullable;
+
 import java.util.ArrayList;
 import java.util.List;

 public class SMAutoAssign {
    private String authRole;
+    private String authRoleAssignReason;
    private List<String> externalTeamIds = new ArrayList<>();

    public SMAutoAssign() {
@@ -47,4 +50,13 @@ public class SMAutoAssign {
    public void addExternalTeamId(String externalRoleId) {
        this.externalTeamIds.add(externalRoleId);
    }
+
+    @Nullable
+    public String getAuthRoleAssignReason() {
+        return authRoleAssignReason;
+    }
+
+    public void setAuthRoleAssignReason(@Nullable String authRoleChangedReason) {
+        this.authRoleAssignReason = authRoleChangedReason;
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -28,10 +28,15 @@ 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 getCommonSignOutLink(
+        @NotNull String providerId,
+        @NotNull Map<String, Object> providerConfig,
+        @NotNull String origin
+    ) throws DBException;

    String getUserSignOutLink(
        @NotNull SMAuthProviderCustomConfiguration providerConfig,
-        @NotNull Map<String, Object> userCredentials
+        @NotNull Map<String, Object> userCredentials,
+        @NotNull String origin
    ) throws DBException;
 }
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -24,7 +24,8 @@ import org.jkiss.utils.CommonUtils;
 /**
 * Abstract external auth provider
 */
-public abstract class AbstractExternalAuthProvider<SESSION extends SMSession> implements SMAuthProviderExternal<SESSION> {
+public abstract class AbstractExternalAuthProvider<SESSION extends SMSession>
+    implements SMAuthProviderExternal<SESSION> {

    public static final String META_AUTH_PROVIDER = "$provider";
    public static final String META_AUTH_SPACE_ID = "$space";
@@ -10,7 +10,7 @@ import org.jkiss.dbeaver.model.runtime.DBRProgressMonitor;
 public abstract class BaseDatasourceAccessCheckHandler implements DBPDataSourceHandler {
    @Override
    public void beforeConnect(
-        DBRProgressMonitor monitor,
+        @NotNull DBRProgressMonitor monitor,
        @NotNull DBPDataSourceContainer dataSourceContainer
    ) throws DBException {
        if (isDriverDisabled(dataSourceContainer.getDriver())) {
@@ -20,7 +20,7 @@ public abstract class BaseDatasourceAccessCheckHandler implements DBPDataSourceH

    @Override
    public void beforeDisconnect(
-        DBRProgressMonitor monitor,
+        @NotNull DBRProgressMonitor monitor,
        @NotNull DBPDataSourceContainer dataSourceContainer
    ) throws DBException {

@@ -0,0 +1,24 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model;
+
+import io.cloudbeaver.model.session.WebSession;
+import org.jkiss.code.NotNull;
+
+public interface CustomCancelableJob {
+    void cancelJob(@NotNull WebSession webSession, @NotNull WebAsyncTaskInfo taskInfo);
+}
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@ public class WebAsyncTaskInfo {
    private Throwable jobError;

    private AbstractJob job;
+    private boolean cancelled = false;

    public WebAsyncTaskInfo(@NotNull String id, @NotNull String name) {
        this.id = id;
@@ -107,5 +108,4 @@ public class WebAsyncTaskInfo {
    public void setJob(AbstractJob job) {
        this.job = job;
    }
-
 }
@@ -16,11 +16,11 @@
 */
 package io.cloudbeaver.model;

+import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.model.connection.DBPDriverConfigurationType;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.dbeaver.model.meta.Property;
-import org.jkiss.utils.CommonUtils;

 import java.util.ArrayList;
 import java.util.List;
@@ -32,10 +32,8 @@ import java.util.Map;
 public class WebConnectionConfig {

    private String connectionId;
-    private String templateId;
    private String driverId;

-    private boolean template;
    private boolean readOnly;

    private String host;
@@ -58,61 +56,64 @@ public class WebConnectionConfig {
    private boolean saveCredentials;
    private boolean sharedCredentials;
    private Map<String, Object> mainPropertyValues;
+    private Map<String, Object> expertSettingsValues;
    private Map<String, Object> providerProperties;
    private List<WebNetworkHandlerConfigInput> networkHandlersConfig;
    private DBPDriverConfigurationType configurationType;
    private String selectedSecretId;
    private boolean defaultAutoCommit;
+    private String defaultCatalogName;
+    private String defaultSchemaName;

    public WebConnectionConfig() {
    }

-    public WebConnectionConfig(Map<String, Object> params) {
-        if (!CommonUtils.isEmpty(params)) {
-            connectionId = JSONUtils.getString(params, "connectionId");
-            templateId = JSONUtils.getString(params, "templateId");
-            String dataSourceId = JSONUtils.getString(params, "dataSourceId");
-            if (CommonUtils.isEmpty(templateId) && !CommonUtils.isEmpty(dataSourceId)) {
-                templateId = dataSourceId;
-            }
-            driverId = JSONUtils.getString(params, "driverId");
+    public WebConnectionConfig(@NotNull Map<String, Object> params) {
+        connectionId = JSONUtils.getString(params, "connectionId");
+        driverId = JSONUtils.getString(params, "driverId");

-            template = JSONUtils.getBoolean(params, "template");
-            readOnly = JSONUtils.getBoolean(params, "readOnly");
+        host = JSONUtils.getString(params, "host");
+        port = JSONUtils.getString(params, "port");
+        serverName = JSONUtils.getString(params, "serverName");
+        databaseName = JSONUtils.getString(params, "databaseName");
+        url = JSONUtils.getString(params, "url");

-            host = JSONUtils.getString(params, "host");
-            port = JSONUtils.getString(params, "port");
-            serverName = JSONUtils.getString(params, "serverName");
-            databaseName = JSONUtils.getString(params, "databaseName");
-            url = JSONUtils.getString(params, "url");
+        name = JSONUtils.getString(params, "name");
+        description = JSONUtils.getString(params, "description");
+        folder = JSONUtils.getString(params, "folder");

-            keepAliveInterval = JSONUtils.getInteger(params, "keepAliveInterval", -1);
-            defaultAutoCommit = JSONUtils.getBoolean(params, "autocommit", true);
+        properties = JSONUtils.getObjectOrNull(params, "properties");
+        userName = JSONUtils.getString(params, "userName");
+        userPassword = JSONUtils.getString(params, "userPassword");
+        selectedSecretId = JSONUtils.getString(params, "selectedSecretId");

-            name = JSONUtils.getString(params, "name");
-            description = JSONUtils.getString(params, "description");
-            folder = JSONUtils.getString(params, "folder");
+        authModelId = JSONUtils.getString(params, "authModelId");
+        credentials = JSONUtils.getObjectOrNull(params, "credentials");
+        saveCredentials = JSONUtils.getBoolean(params, "saveCredentials");
+        sharedCredentials = JSONUtils.getBoolean(params, "sharedCredentials");

-            properties = JSONUtils.getObjectOrNull(params, "properties");
-            userName = JSONUtils.getString(params, "userName");
-            userPassword = JSONUtils.getString(params, "userPassword");
-            selectedSecretId = JSONUtils.getString(params, "selectedSecretId");
+        mainPropertyValues = JSONUtils.getObjectOrNull(params, "mainPropertyValues");
+        providerProperties = JSONUtils.getObjectOrNull(params, "providerProperties");
+        expertSettingsValues = JSONUtils.getObjectOrNull(params, "expertSettingsValues");
+        keepAliveInterval = JSONUtils.getInteger(
+            expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_KEEP_ALIVE_INTERVAL, -1);
+        readOnly = JSONUtils.getBoolean(
+            expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_READ_ONLY);
+        defaultAutoCommit = JSONUtils.getBoolean(
+            expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_AUTO_COMMIT, true);
+        defaultCatalogName = JSONUtils.getString(
+            expertSettingsValues != null ? expertSettingsValues : params, WebExpertSettingsProperties.PROP_DEFAULT_CATALOG);
+        defaultSchemaName = JSONUtils.getString(
+            expertSettingsValues != null ? expertSettingsValues : params,
+            WebExpertSettingsProperties.PROP_DEFAULT_SCHEMA
+        );

-            authModelId = JSONUtils.getString(params, "authModelId");
-            credentials = JSONUtils.getObjectOrNull(params, "credentials");
-            saveCredentials = JSONUtils.getBoolean(params, "saveCredentials");
-            sharedCredentials = JSONUtils.getBoolean(params, "sharedCredentials");
+        String configType = JSONUtils.getString(params, "configurationType");
+        configurationType = configType == null ? null : DBPDriverConfigurationType.valueOf(configType);

-            mainPropertyValues = JSONUtils.getObjectOrNull(params, "mainPropertyValues");
-            providerProperties = JSONUtils.getObjectOrNull(params, "providerProperties");
-
-            String configType = JSONUtils.getString(params, "configurationType");
-            configurationType = configType == null ? null : DBPDriverConfigurationType.valueOf(configType);
-
-            networkHandlersConfig = new ArrayList<>();
-            for (Map<String, Object> nhc : JSONUtils.getObjectList(params, "networkHandlersConfig")) {
-                networkHandlersConfig.add(new WebNetworkHandlerConfigInput(nhc));
-            }
+        networkHandlersConfig = new ArrayList<>();
+        for (Map<String, Object> nhc : JSONUtils.getObjectList(params, "networkHandlersConfig")) {
+            networkHandlersConfig.add(new WebNetworkHandlerConfigInput(nhc));
        }
    }

@@ -121,21 +122,11 @@ public class WebConnectionConfig {
        return connectionId;
    }

-    @Property
-    public String getTemplateId() {
-        return templateId;
-    }
-
    @Property
    public String getDriverId() {
        return driverId;
    }

-    @Property
-    public boolean isTemplate() {
-        return template;
-    }
-
    @Property
    public boolean isReadOnly() {
        return readOnly;
@@ -234,6 +225,11 @@ public class WebConnectionConfig {
        return mainPropertyValues;
    }

+    @Property
+    public Map<String, Object> getExpertSettingsValues() {
+        return expertSettingsValues;
+    }
+
    @Property
    public Map<String, Object> getProviderProperties() {
        return providerProperties;
@@ -253,4 +249,14 @@ public class WebConnectionConfig {
    public String getSelectedSecretId() {
        return selectedSecretId;
    }
+
+    @Property
+    public String getDefaultCatalogName() {
+        return defaultCatalogName;
+    }
+
+    @Property
+    public String getDefaultSchemaName() {
+        return defaultSchemaName;
+    }
 }
@@ -16,6 +16,7 @@
 */
 package io.cloudbeaver.model;

+import io.cloudbeaver.DBWebException;
 import io.cloudbeaver.WebProjectImpl;
 import io.cloudbeaver.model.app.BaseWebAppConfiguration;
 import io.cloudbeaver.model.session.WebSession;
@@ -171,11 +172,6 @@ public class WebConnectionInfo {
        return dataSourceContainer.isConnected();
    }

-    @Property
-    public boolean isTemplate() {
-        return dataSourceContainer.isTemplate();
-    }
-
    @Property
    public boolean isProvided() {
        return dataSourceContainer.isProvided();
@@ -256,6 +252,7 @@ public class WebConnectionInfo {
    }

    @Property
+    @NotNull
    public String[] getFeatures() {
        List<String> features = new ArrayList<>();

@@ -285,11 +282,13 @@ public class WebConnectionInfo {
    }

    @Property
+    @NotNull
    public DBNBrowseSettings getNavigatorSettings() {
        return dataSourceContainer.getNavigatorSettings();
    }

    @Property
+    @NotNull
    public List<WebDataFormat> getSupportedDataFormats() {
        List<WebDataFormat> formats = new ArrayList<>();
        formats.add(WebDataFormat.resultset);
@@ -304,11 +303,13 @@ public class WebConnectionInfo {
    }

    @Property
+    @NotNull
    public WebConnectionOriginInfo getOrigin() {
        return new WebConnectionOriginInfo(session, dataSourceContainer, dataSourceContainer.getOrigin());
    }

    @Property
+    @NotNull
    public DBPDriverConfigurationType getConfigurationType() {
        DBPDriverConfigurationType configurationType = dataSourceContainer.getConnectionConfiguration().getConfigurationType();
        if (configurationType == null) {
@@ -324,12 +325,17 @@ public class WebConnectionInfo {
            !dataSourceContainer.getDriver().isAnonymousAccess();
    }

+    public void validateConnection() throws DBWebException {
+
+    }
+
    // we don't show non-secured properties in FE when connecting to DB without saved credentials
    private boolean isAuthPropertiesEmpty() {
        return Arrays.stream(getAuthProperties()).allMatch(f -> f.hasFeature(DBConstants.PROP_FEATURE_NON_SECURED));
    }

    @Property
+    @NotNull
    public String getAuthModel() {
        String authModelId = dataSourceContainer.getConnectionConfiguration().getAuthModelId();
        if (CommonUtils.isEmpty(authModelId)) {
@@ -339,6 +345,7 @@ public class WebConnectionInfo {
    }

    @Property
+    @NotNull
    public WebPropertyInfo[] getAuthProperties() {
        String authModelId = getAuthModel();
        DBPAuthModelDescriptor authModel = DBWorkbench.getPlatform().getDataSourceProviderRegistry().getAuthModel(authModelId);
@@ -361,6 +368,7 @@ public class WebConnectionInfo {
    }

    @Property
+    @NotNull
    public List<WebNetworkHandlerConfig> getNetworkHandlersConfig() {
        var registry = NetworkHandlerRegistry.getInstance();
        return dataSourceContainer.getConnectionConfiguration()
@@ -375,20 +383,23 @@ public class WebConnectionInfo {
    }

    @Property
+    @Nullable
    public Map<String, Object> getCredentials() {
        //dataSourceContainer.getConnectionConfiguration().getCredentialsProvider().getCredentials();
        return null;
    }

+    @Nullable
    public Map<String, Object> getSavedAuthProperties() {
        return savedAuthProperties;
    }

+    @Nullable
    public List<WebNetworkHandlerConfigInput> getSavedNetworkCredentials() {
        return savedNetworkCredentials;
    }

-    public void setSavedCredentials(Map<String, Object> authProperties, List<WebNetworkHandlerConfigInput> networkCredentials) {
+    public void setSavedCredentials(@Nullable Map<String, Object> authProperties, @Nullable List<WebNetworkHandlerConfigInput> networkCredentials) {
        this.savedAuthProperties = authProperties;
        this.savedNetworkCredentials = networkCredentials;
    }
@@ -413,6 +424,7 @@ public class WebConnectionInfo {
    }

    @Property
+    @NotNull
    public Map<String, String> getMainPropertyValues() {
        Map<String, String> mainProperties = new LinkedHashMap<>();
        mainProperties.put(DBConstants.PROP_HOST, getHost());
@@ -422,6 +434,17 @@ public class WebConnectionInfo {
        return mainProperties;
    }

+    @Property
+    public Map<String, Object> getExpertSettingsValues() {
+        Map<String, Object> expertSettings = new LinkedHashMap<>();
+        expertSettings.put(WebExpertSettingsProperties.PROP_AUTO_COMMIT, isAutocommit());
+        expertSettings.put(WebExpertSettingsProperties.PROP_KEEP_ALIVE_INTERVAL, getKeepAliveInterval());
+        expertSettings.put(WebExpertSettingsProperties.PROP_READ_ONLY, isReadOnly());
+        expertSettings.put(WebExpertSettingsProperties.PROP_DEFAULT_CATALOG, getDefaultCatalogName());
+        expertSettings.put(WebExpertSettingsProperties.PROP_DEFAULT_SCHEMA, getDefaultSchemaName());
+        return expertSettings;
+    }
+
    @Property
    public Map<String, String> getProviderProperties() {
        return dataSourceContainer.getConnectionConfiguration().getProviderProperties();
@@ -457,7 +480,7 @@ public class WebConnectionInfo {
        return dataSourceContainer.getRequiredExternalAuth();
    }

-    private boolean hasProjectPermission(RMProjectPermission projectPermission) {
+    private boolean hasProjectPermission(@NotNull RMProjectPermission projectPermission) {
        DBPProject project = dataSourceContainer.getProject();
        if (!(project instanceof WebProjectImpl webProject)) {
            return false;
@@ -497,6 +520,21 @@ public class WebConnectionInfo {
    }

    @Property
+    @Nullable
+    public String getDefaultCatalogName() {
+        DBPConnectionConfiguration connectionConfiguration = dataSourceContainer.getConnectionConfiguration();
+        return connectionConfiguration.getBootstrap().getDefaultCatalogName();
+    }
+
+    @Property
+    @Nullable
+    public String getDefaultSchemaName() {
+        DBPConnectionConfiguration connectionConfiguration = dataSourceContainer.getConnectionConfiguration();
+        return connectionConfiguration.getBootstrap().getDefaultSchemaName();
+    }
+
+    @Property
+    @NotNull
    public List<WebSecretInfo> getSharedSecrets() throws DBException {
        return dataSourceContainer.listSharedCredentials()
            .stream()
@@ -504,8 +542,8 @@ public class WebConnectionInfo {
            .collect(Collectors.toList());
    }

-    @NotNull
    @Property
+    @NotNull
    public List<String> getTools() {
        if (!session.hasPermission(RMConstants.PERMISSION_DATABASE_DEVELOPER)) {
            return List.of();
@@ -0,0 +1,88 @@
+package io.cloudbeaver.model;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.DBPObject;
+import org.jkiss.dbeaver.model.connection.DBPDriver;
+import org.jkiss.dbeaver.model.connection.DBPDriverConstants;
+import org.jkiss.dbeaver.model.meta.IPropertyValueValidator;
+import org.jkiss.dbeaver.model.meta.Property;
+import org.jkiss.utils.CommonUtils;
+
+/**
+ * Web expert settings properties. Class for returning filtered expert settings properties in web interface.
+ */
+public class WebExpertSettingsProperties implements DBPObject {
+    public static final String PROP_READ_ONLY = "readOnly";
+    public static final String PROP_AUTO_COMMIT = "autocommit";
+    public static final String PROP_KEEP_ALIVE_INTERVAL = "keepAliveInterval";
+    public static final String PROP_DEFAULT_CATALOG = "defaultCatalogName";
+    public static final String PROP_DEFAULT_SCHEMA = "defaultSchemaName";
+
+    private final DBPDriver driver;
+
+    public WebExpertSettingsProperties(@NotNull DBPDriver driver) {
+        this.driver = driver;
+    }
+
+    @Property(order = 1, id = PROP_KEEP_ALIVE_INTERVAL, visibleIf = KeepAliveIntervalFieldValidator.class)
+    public int getKeepAliveInterval() {
+        return 0;
+    }
+
+    @Property(order = 2, id = PROP_AUTO_COMMIT, visibleIf = AutoCommitFieldValidator.class)
+    public boolean isAutoCommit() {
+        return true;
+    }
+
+    @Property(order = 3, id = PROP_READ_ONLY, visibleIf = ReadOnlyFieldValidator.class)
+    public boolean isReadOnly() {
+        return false;
+    }
+
+    @Property(order = 4, id = PROP_DEFAULT_CATALOG, visibleIf = DefaultCatalogFieldVisibleValidator.class)
+    public String getDefaultCatalog() {
+        return null;
+    }
+
+    @Property(order = 5, id = PROP_DEFAULT_SCHEMA, visibleIf = DefaultSchemaFieldVisibleValidator.class)
+    public String getDefaultSchema() {
+        return null;
+    }
+
+
+    public static class KeepAliveIntervalFieldValidator implements IPropertyValueValidator<WebExpertSettingsProperties, Object> {
+        @Override
+        public boolean isValidValue(@NotNull WebExpertSettingsProperties object, @Nullable Object value) throws IllegalArgumentException {
+            return CommonUtils.toBoolean(!object.driver.isEmbedded(), true);
+        }
+    }
+
+    public static class AutoCommitFieldValidator implements IPropertyValueValidator<WebExpertSettingsProperties, Object> {
+        @Override
+        public boolean isValidValue(@NotNull WebExpertSettingsProperties object, @Nullable Object value) throws IllegalArgumentException {
+            return CommonUtils.toBoolean(object.driver.getDriverParameter(DBPDriverConstants.PARAM_SUPPORTS_TRANSACTIONS), true);
+        }
+    }
+
+    public static class ReadOnlyFieldValidator implements IPropertyValueValidator<WebExpertSettingsProperties, Object> {
+        @Override
+        public boolean isValidValue(@NotNull WebExpertSettingsProperties object, @Nullable Object value) throws IllegalArgumentException {
+            return CommonUtils.toBoolean(object.driver.getDriverParameter(DBPDriverConstants.PARAM_SUPPORTS_READ_ONLY_MODE), true);
+        }
+    }
+
+    public static class DefaultCatalogFieldVisibleValidator implements IPropertyValueValidator<WebExpertSettingsProperties, Object> {
+        @Override
+        public boolean isValidValue(@NotNull WebExpertSettingsProperties object, @Nullable Object value) throws IllegalArgumentException {
+            return CommonUtils.toBoolean(object.driver.getDriverParameter(DBPDriverConstants.PARAM_SUPPORTS_CATALOG_SELECTION), true);
+        }
+    }
+
+    public static class DefaultSchemaFieldVisibleValidator implements IPropertyValueValidator<WebExpertSettingsProperties, Object> {
+        @Override
+        public boolean isValidValue(@NotNull WebExpertSettingsProperties object, @Nullable Object value) throws IllegalArgumentException {
+            return CommonUtils.toBoolean(object.driver.getDriverParameter(DBPDriverConstants.PARAM_SUPPORTS_SCHEMA_SELECTION), true);
+        }
+    }
+}
@@ -247,6 +247,10 @@ public class WebPropertyInfo {
            }
            return result;
        }
+        Class<?> dataType = property.getDataType();
+        if (dataType == Boolean.class || dataType == Boolean.TYPE) {
+            return Boolean.valueOf(value.toString());
+        }
        return CommonUtils.toString(value);
    }

@@ -259,6 +263,28 @@ public class WebPropertyInfo {
        return null;
    }

+    /**
+     * Returns expression for a visibility of a property.
+     */
+    @Nullable
+    @Property
+    public List<Condition> getConditions() {
+        if (!(property instanceof DBPConditionalProperty conditionalProperty)) {
+            return null;
+        }
+        List<Condition> conditions = new ArrayList<>();
+        String visibleExpr = conditionalProperty.getHideExpression();
+        if (CommonUtils.isNotEmpty(visibleExpr)) {
+            conditions.add(new Condition(visibleExpr, Condition.Type.HIDE));
+        }
+        String activeExpr = conditionalProperty.getReadOnlyExpression();
+        if (CommonUtils.isNotEmpty(activeExpr)) {
+            conditions.add(new Condition(activeExpr, Condition.Type.READ_ONLY));
+        }
+        return conditions;
+    }
+
+
    //TODO: delete after refactoring on front-end
    public void setDefaultValue(String defaultValue) {
        this.defaultValue = defaultValue;
@@ -273,5 +299,10 @@ public class WebPropertyInfo {
        this.supportedConfigurationTypes = supportedConfigurationTypes;
    }

-
+    public record Condition(@NotNull String expression, @NotNull Type conditionType) {
+        public enum Type {
+            HIDE,
+            READ_ONLY
+        }
+    }
 }
@@ -0,0 +1,45 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.apilog;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+
+import java.time.LocalDateTime;
+import java.util.Map;
+
+/**
+ * Interceptor for API call events.
+ * This interface allows to intercept and log API call events in a web application.
+ */
+public interface ApiCallInterceptor {
+
+    /**
+     * Intercept API call event.
+     *
+     */
+    void onApiCallEvent(
+        @NotNull HttpServletRequest request,
+        @Nullable Map<String, Object> variables,
+        @NotNull String apiCall,
+        @Nullable String userId,
+        @NotNull LocalDateTime startTime,
+        @Nullable String errorMessage,
+        @NotNull String apiProtocol
+    );
+}
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,10 +19,10 @@ 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.code.Nullable;
 import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.registry.fs.FileSystemProviderRegistry;
-import org.jkiss.utils.IOUtils;
+import org.jkiss.utils.CommonUtils;

 import java.net.URI;
 import java.nio.file.FileSystem;
@@ -38,12 +38,13 @@ public abstract class BaseServerConfigurationController<T extends ServletServerC
    @NotNull
    private final Path homeDirectory;

-    protected Path workspacePath;
+    @NotNull
+    protected final Path workspacePath;

    protected BaseServerConfigurationController(@NotNull Path homeDirectory) {
        this.homeDirectory = homeDirectory;
-        //default workspaceLocation
-        this.workspacePath = homeDirectory.resolve("workspace");
+        this.workspacePath = initWorkspacePath();
+        log.debug("Workspace path initialized: " + workspacePath.toAbsolutePath());
    }

    @NotNull
@@ -54,39 +55,44 @@ public abstract class BaseServerConfigurationController<T extends ServletServerC
    @NotNull
    protected abstract GsonBuilder getGsonBuilder();

+    @NotNull
    public abstract T getServerConfiguration();

-
    @NotNull
-    protected synchronized void initWorkspacePath() throws DBException {
-        if (workspacePath != null && !IOUtils.isFileFromDefaultFS(workspacePath)) {
-            log.warn("Workspace directory already initialized: " + workspacePath);
+    protected synchronized Path initWorkspacePath() {
+        Path defaultWorkspaceLocation = homeDirectory.resolve("workspace");
+        String workspaceLocation = getWorkspaceLocationFromEnv();
+        if (CommonUtils.isEmpty(workspaceLocation)) {
+            return defaultWorkspaceLocation;
        }
-        String workspaceLocation = getWorkspaceLocation();
        URI workspaceUri = URI.create(workspaceLocation);
        if (workspaceUri.getScheme() == null) {
            // default filesystem
-            this.workspacePath = getHomeDirectory().resolve(workspaceLocation);
+            return 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());
+                log.error("File system not found for scheme: " + workspaceUri.getScheme() + " default workspace " +
+                    "location will be used");
+                return defaultWorkspaceLocation;
            }
            ClassLoader fsClassloader = externalFsProvider.getInstance().getClass().getClassLoader();
            try (FileSystem externalFileSystem = FileSystems.newFileSystem(workspaceUri,
                System.getenv(),
-                fsClassloader);) {
-                this.workspacePath = externalFileSystem.provider().getPath(workspaceUri);
+                fsClassloader)) {
+                log.info("Path from external filesystem used for workspace: " + workspaceUri);
+                return externalFileSystem.provider().getPath(workspaceUri);
            } catch (Exception e) {
-                throw new DBException("Failed to initialize workspace path: " + workspaceUri, e);
+                log.error("Failed to initialize workspace path: " + workspaceUri + " default workspace " +
+                    "location will be used", e);
            }
        }
-        log.info("Workspace path initialized: " + workspacePath);
+        return defaultWorkspaceLocation;
    }

-    @NotNull
-    protected abstract String getWorkspaceLocation();
+    @Nullable
+    protected abstract String getWorkspaceLocationFromEnv();

    @NotNull
    protected Path getHomeDirectory() {
@@ -96,9 +102,6 @@ public abstract class BaseServerConfigurationController<T extends ServletServerC
    @NotNull
    @Override
    public Path getWorkspacePath() {
-        if (workspacePath == null) {
-            throw new RuntimeException("Workspace path not initialized");
-        }
        return workspacePath;
    }
 }
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 */
 package io.cloudbeaver.model.app;

+import io.cloudbeaver.model.cli.CloudBeaverInstanceServer;
 import io.cloudbeaver.model.log.SLF4JLogHandler;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.equinox.app.IApplicationContext;
@@ -27,6 +28,7 @@ import org.jkiss.dbeaver.model.DBFileController;
 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.cli.ApplicationInstanceController;
 import org.jkiss.dbeaver.model.data.json.JSONUtils;
 import org.jkiss.dbeaver.model.impl.app.ApplicationRegistry;
 import org.jkiss.dbeaver.model.impl.app.BaseApplicationImpl;
@@ -39,6 +41,7 @@ import org.jkiss.dbeaver.utils.GeneralUtils;
 import org.jkiss.dbeaver.utils.RuntimeUtils;
 import org.jkiss.utils.CommonUtils;

+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.List;
@@ -57,7 +60,7 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
    private static final Log log = Log.getLog(BaseServletApplication.class);

    private String instanceId;
-
+    private CloudBeaverInstanceServer instanceServer;
    @Override
    public RMController createResourceController(
        @NotNull SMCredentialsProvider credentialsProvider,
@@ -75,7 +78,7 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
    @Nullable
    @Override
    public Path getDefaultWorkingFolder() {
-        return null;
+        return getServerConfigurationController().getWorkspacePath();
    }

    @Override
@@ -196,15 +199,26 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
        }
    }

+    @NotNull
    @Override
    public Object start(IApplicationContext context) {
        initializeApplicationServices();
        try {
+            try {
+                this.instanceServer = createInstanceServer();
+            } catch (Exception e) {
+                log.error("Error initializing instance server", e);
+            }
            startServer();
        } catch (Exception e) {
            log.error(e.getMessage(), e);
+            return EXIT_ERROR_UNSPECIFIED;
        }
-        return null;
+        return EXIT_OK;
+    }
+
+    protected CloudBeaverInstanceServer createInstanceServer() throws IOException {
+        return new CloudBeaverInstanceServer();
    }

    protected abstract void startServer() throws DBException;
@@ -266,4 +280,15 @@ public abstract class BaseServletApplication extends BaseApplicationImpl impleme
            log.error("Failed close " + name, e);
        }
    }
+
+    @Nullable
+    @Override
+    public ApplicationInstanceController getInstanceServer() {
+        return instanceServer;
+    }
+
+    @Override
+    public boolean isAnonymousAccessEnabled() {
+        return getAppConfiguration().isAnonymousAccessEnabled();
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,7 +18,9 @@ package io.cloudbeaver.model.app;

 import io.cloudbeaver.DBWFeatureSet;
 import io.cloudbeaver.registry.WebFeatureRegistry;
+import io.cloudbeaver.utils.ServletAppUtils;
 import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.DBConstants;
 import org.jkiss.utils.ArrayUtils;

 import java.util.Collections;
@@ -34,6 +36,7 @@ public abstract class BaseWebAppConfiguration implements ServletAppConfiguration
    protected boolean secretManagerEnabled;
    protected boolean showReadOnlyConnectionInfo;
    protected String[] enabledFeatures;
+    protected String[] disabledFeatures;
    protected String[] disabledBetaFeatures;


@@ -41,6 +44,7 @@ public abstract class BaseWebAppConfiguration implements ServletAppConfiguration
        this.plugins = new LinkedHashMap<>();
        this.resourceManagerEnabled = true;
        this.enabledFeatures = null;
+        this.disabledFeatures = new String[0];
        this.disabledBetaFeatures = new String[0];
        this.showReadOnlyConnectionInfo = false;
        this.secretManagerEnabled = false;
@@ -51,6 +55,7 @@ public abstract class BaseWebAppConfiguration implements ServletAppConfiguration
        this.defaultUserTeam = src.defaultUserTeam;
        this.resourceManagerEnabled = src.resourceManagerEnabled;
        this.enabledFeatures = src.enabledFeatures;
+        this.disabledFeatures = src.disabledFeatures;
        this.disabledBetaFeatures = src.disabledBetaFeatures;
        this.showReadOnlyConnectionInfo = src.showReadOnlyConnectionInfo;
        this.secretManagerEnabled = src.secretManagerEnabled;
@@ -94,6 +99,9 @@ public abstract class BaseWebAppConfiguration implements ServletAppConfiguration

    @Override
    public boolean isFeatureEnabled(String id) {
+        if (DBConstants.PRODUCT_FEATURE_DISTRIBUTED.equals(id)) {
+            return ServletAppUtils.getServletApplication().isDistributed();
+        }
        return ArrayUtils.contains(getEnabledFeatures(), id);
    }

@@ -117,6 +125,16 @@ public abstract class BaseWebAppConfiguration implements ServletAppConfiguration
        this.enabledFeatures = enabledFeatures;
    }

+    @NotNull
+    @Override
+    public String[] getDisabledFeatures() {
+        return disabledFeatures;
+    }
+
+    public void setDisabledFeatures(@NotNull String[] disabledFeatures) {
+        this.disabledFeatures = disabledFeatures;
+    }
+
    public boolean isShowReadOnlyConnectionInfo() {
        return showReadOnlyConnectionInfo;
    }
@@ -51,6 +51,16 @@ public interface ServletAppConfiguration {
        return new String[0];
    }

+    /**
+     * Returns disabled features.
+     *
+     * @return array of disabled feature IDs
+     */
+    @NotNull
+    default String[] getDisabledFeatures() {
+        return new String[0];
+    }
+
    default boolean isSupportsCustomConnections() {
        return true;
    }
@@ -91,7 +91,15 @@ public interface ServletApplication extends DBPApplication {

    boolean isLicenseRequired();

+    /**
+     * Collector that contains information about system.
+     */
+    @NotNull
+    ServletSystemInformationCollector getSystemInformationCollector();
+
    default void getStatusInfo(Map<String, Object> infoMap) {

    }
+
+    boolean isAnonymousAccessEnabled();
 }
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,12 +18,15 @@
 package io.cloudbeaver.model.app;

 import io.cloudbeaver.auth.CBAuthConstants;
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;

 public interface ServletAuthApplication extends ServletApplication {
    ServletAuthConfiguration getAuthConfiguration();

-    String getAuthServiceURL();
+    @Nullable
+    String getAuthServiceUriSegment();

    default long getMaxSessionIdleTime() {
        return CBAuthConstants.MAX_SESSION_IDLE_TIME;
@@ -32,4 +35,8 @@ public interface ServletAuthApplication extends ServletApplication {
    void flushConfiguration() throws DBException;

    String getDefaultAuthRole();
+
+    default String modifyOrigin(@NotNull String origin) {
+        return origin;
+    }
 }
@@ -0,0 +1,179 @@
+/*
+ * 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 io.cloudbeaver.auth.NoAuthCredentialsProvider;
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.DBException;
+import org.jkiss.dbeaver.model.DBPConnectionInformation;
+import org.jkiss.dbeaver.model.DBPObject;
+import org.jkiss.dbeaver.model.meta.Property;
+import org.jkiss.dbeaver.model.meta.PropertyGroup;
+import org.jkiss.dbeaver.model.meta.PropertyLength;
+import org.jkiss.dbeaver.utils.GeneralUtils;
+import org.jkiss.dbeaver.utils.SystemVariablesResolver;
+import org.jkiss.utils.StandardConstants;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+/**
+ * Web system information collector.
+ */
+public class ServletSystemInformationCollector<T extends ServletApplication> implements DBPObject {
+
+    private enum DeploymentType {
+        DEFAULT,
+        DOCKER,
+        KUBERNETES
+    }
+
+    @NotNull
+    protected final T application;
+
+    @NotNull
+    private final String osInfo;
+    @NotNull
+    private final String javaVersion;
+    @NotNull
+    private final String javaParameters;
+    @NotNull
+    private final String productName;
+    @NotNull
+    private final String productVersion;
+    @NotNull
+    private final String memoryAvailable;
+    @NotNull
+    private final String installPath;
+    private DBPConnectionInformation smDatabaseInfo;
+    private String workspacePath;
+    private final DeploymentType deploymentType;
+    private boolean internalDatabaseInfoCollected = false;
+
+    public ServletSystemInformationCollector(@NotNull T application) {
+        this.application = application;
+        this.osInfo = System.getProperty(StandardConstants.ENV_OS_NAME) + " " + System.getProperty(
+            StandardConstants.ENV_OS_VERSION) + " (" + System.getProperty(StandardConstants.ENV_OS_ARCH) + ")";
+        this.javaVersion = System.getProperty(StandardConstants.ENV_JAVA_VERSION) + " by " + System.getProperty(
+            StandardConstants.ENV_JAVA_VENDOR) + " (" + System.getProperty(StandardConstants.ENV_JAVA_ARCH) + "bit)";
+        this.javaParameters = System.getProperty("sun.java.command");
+        this.productName = GeneralUtils.getProductName();
+        this.productVersion = GeneralUtils.getProductVersion().toString();
+        this.installPath = SystemVariablesResolver.getInstallPath();
+        this.memoryAvailable = "%dMb/%dMb".formatted(
+            Runtime.getRuntime().totalMemory() / (1024 * 1024),
+            Runtime.getRuntime().maxMemory() / (1024 * 1024)
+        );
+        deploymentType = checkDeploymentType();
+    }
+
+    private DeploymentType checkDeploymentType() {
+        if (System.getenv("KUBERNETES_SERVICE_HOST") != null) {
+            return DeploymentType.KUBERNETES;
+        }
+        if (isRunningInDocker()) {
+            return DeploymentType.DOCKER;
+        }
+
+        return DeploymentType.DEFAULT;
+    }
+
+    @NotNull
+    @Property(order = 1)
+    public String getProductName() {
+        return productName;
+    }
+
+    @NotNull
+    @Property(order = 2)
+    public String getProductVersion() {
+        return productVersion;
+    }
+
+    @NotNull
+    @Property(order = 11)
+    public String getOsInfo() {
+        return osInfo;
+    }
+
+    @NotNull
+    @Property(order = 12)
+    public String getMemoryAvailable() {
+        return memoryAvailable;
+    }
+
+    @NotNull
+    @Property(order = 21, length = PropertyLength.MULTILINE)
+    public String getJavaVersion() {
+        return javaVersion;
+    }
+
+    @NotNull
+    @Property(order = 22, length = PropertyLength.MULTILINE)
+    public String getJavaParameters() {
+        return javaParameters;
+    }
+
+    @NotNull
+    @Property(order = 23)
+    public String getDeploymentType() {
+        return deploymentType.name();
+    }
+
+    @NotNull
+    @PropertyGroup(order = 31, category = "Security manager database", groupId = "sm")
+    public DBPConnectionInformation getSmDatabaseInfo() {
+        return smDatabaseInfo;
+    }
+
+    @Property(order = Integer.MAX_VALUE - 10, length = PropertyLength.MULTILINE)
+    public String getWorkspacePath() {
+        return workspacePath;
+    }
+
+    public void setWorkspacePath(String workspacePath) {
+        this.workspacePath = workspacePath;
+    }
+
+    @NotNull
+    @Property(order = Integer.MAX_VALUE - 10, length = PropertyLength.MULTILINE)
+    public String getInstallPath() {
+        return installPath;
+    }
+
+
+    /**
+     * Collects info about internal databases.
+     */
+    public synchronized void collectInternalDatabaseUseInformation() throws DBException {
+        if (internalDatabaseInfoCollected) {
+            return;
+        }
+        collectInternalDatabaseInfo();
+        this.internalDatabaseInfoCollected = true;
+    }
+
+    protected void collectInternalDatabaseInfo() throws DBException {
+        this.smDatabaseInfo = application.getAdminSecurityController(new NoAuthCredentialsProvider())
+            .getInternalDatabaseInformation();
+    }
+
+    private static boolean isRunningInDocker() {
+        Path cgroupPath = Path.of("/.dockerenv");
+        return Files.exists(cgroupPath);
+    }
+}
@@ -0,0 +1,56 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.cli;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.cli.*;
+import org.jkiss.dbeaver.model.cli.model.CommandLineAuthenticator;
+import picocli.CommandLine;
+
+public class CloudBeaverCommandLine extends ApplicationCommandLine<ApplicationInstanceController> {
+
+    @Nullable
+    private final CommandLineAuthenticator authenticator;
+
+    public CloudBeaverCommandLine(@Nullable CommandLineAuthenticator authenticator) {
+        super();
+        this.authenticator = authenticator;
+    }
+
+    @Override
+    protected CloudBeaverTopLevelCommand createTopLevelCommand(
+        @Nullable ApplicationInstanceController applicationInstanceController,
+        @NotNull CommandLineContext context,
+        @NotNull CLIRunMeta runMeta
+    ) {
+        if (authenticator != null) {
+            context.setContextParameter(CLIConstants.CONTEXT_PARAM_AUTHENTICATOR, authenticator);
+        }
+        return new CloudBeaverTopLevelCommand(applicationInstanceController, context, runMeta);
+    }
+
+    @NotNull
+    @Override
+    protected CommandLine initCommandLine(
+        @Nullable ApplicationInstanceController applicationInstanceController,
+        @NotNull CommandLineContext context,
+        @NotNull CLIRunMeta runMeta
+    ) {
+        return super.initCommandLine(applicationInstanceController, context, runMeta);
+    }
+}
@@ -0,0 +1,54 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.cli;
+
+
+import org.jkiss.code.NotNull;
+import org.jkiss.dbeaver.model.cli.ApplicationInstanceController;
+import org.jkiss.dbeaver.model.cli.ApplicationInstanceServer;
+import org.jkiss.dbeaver.model.cli.CLIProcessResult;
+
+import java.io.IOException;
+
+public class CloudBeaverInstanceServer extends ApplicationInstanceServer<ApplicationInstanceController> {
+    private final CloudBeaverCommandLine commandLine;
+
+    public CloudBeaverInstanceServer() throws IOException {
+        super(ApplicationInstanceController.class);
+        this.commandLine = new CloudBeaverCommandLine(null);
+    }
+
+    protected CloudBeaverInstanceServer(@NotNull CloudBeaverCommandLine commandLine) throws IOException {
+        super(ApplicationInstanceController.class);
+        this.commandLine = commandLine;
+    }
+
+    @NotNull
+    @Override
+    public CLIProcessResult handleCommandLine(@NotNull String[] args) {
+        try {
+            return commandLine.executeCommandLineCommands(
+                this,
+                false,
+                false,
+                args
+            );
+        } catch (Exception e) {
+            return new CLIProcessResult(CLIProcessResult.PostAction.ERROR, "Error executing command: " + e.getMessage());
+        }
+    }
+}
@@ -0,0 +1,37 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.cli;
+
+import org.jkiss.code.NotNull;
+import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.cli.ApplicationInstanceController;
+import org.jkiss.dbeaver.model.cli.CLIRunMeta;
+import org.jkiss.dbeaver.model.cli.CommandLineContext;
+import org.jkiss.dbeaver.model.cli.command.AbstractTopLevelCommand;
+import picocli.CommandLine;
+
+@CommandLine.Command(name = "cbvr", description = "CloudBeaver commands", mixinStandardHelpOptions = true)
+public class CloudBeaverTopLevelCommand extends AbstractTopLevelCommand {
+    protected CloudBeaverTopLevelCommand(
+        @Nullable ApplicationInstanceController controller,
+        @NotNull CommandLineContext context,
+        @NotNull CLIRunMeta meta
+
+    ) {
+        super(controller, context, meta);
+    }
+}
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -14,10 +14,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package io.cloudbeaver.server;
+package io.cloudbeaver.model.cli;

-public interface HttpConstants {
-    String CONTENT_TYPE = "Content-Type";
-
-    String TYPE_JSON = "application/json";
+public interface CloudbeaverCliConstants {
+    String CLI_MODE = "cliMode";
 }
@@ -19,8 +19,8 @@ package io.cloudbeaver.model.config;
 import com.google.gson.annotations.Expose;
 import io.cloudbeaver.auth.provider.local.LocalAuthProviderConstants;
 import io.cloudbeaver.model.app.BaseWebAppConfiguration;
-import io.cloudbeaver.model.app.WebAppConfiguration;
 import io.cloudbeaver.model.app.ServletAuthConfiguration;
+import io.cloudbeaver.model.app.WebAppConfiguration;
 import io.cloudbeaver.registry.WebAuthProviderDescriptor;
 import io.cloudbeaver.registry.WebAuthProviderRegistry;
 import org.jkiss.code.NotNull;
@@ -0,0 +1,62 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.config;
+
+/**
+ * Connection brute force configuration.
+ */
+public class ConnectionBruteForceConfiguration {
+    private static final int DEFAULT_ERROR_ATTEMPTS_CHECK_MINUTES = 24 * 60;
+    private static final int BLOCK_TIME_IN_MINUTES = 60;
+    private static final int DEFAULT_MAX_CONNECT_ATTEMPTS = 5;
+    private boolean enabled = false;
+    private int maxFailedConnectAttempts = DEFAULT_MAX_CONNECT_ATTEMPTS;
+    private int errorAttemptsPeriodInMinutes = DEFAULT_ERROR_ATTEMPTS_CHECK_MINUTES;
+    private int blockTimeInMinutes = BLOCK_TIME_IN_MINUTES;
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public int getMaxFailedConnectAttempts() {
+        return maxFailedConnectAttempts;
+    }
+
+    public void setMaxFailedConnectAttempts(int maxFailedConnectAttempts) {
+        this.maxFailedConnectAttempts = maxFailedConnectAttempts;
+    }
+
+    public int getErrorAttemptsPeriodInMinutes() {
+        return errorAttemptsPeriodInMinutes;
+    }
+
+    public void setErrorAttemptsPeriodInMinutes(int errorAttemptsPeriodInMinutes) {
+        this.errorAttemptsPeriodInMinutes = errorAttemptsPeriodInMinutes;
+    }
+
+    public int getBlockTimeInMinutes() {
+        return blockTimeInMinutes;
+    }
+
+    public void setBlockTimeInMinutes(int blockTimeInMinutes) {
+        this.blockTimeInMinutes = blockTimeInMinutes;
+    }
+}
@@ -60,26 +60,31 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
        return project.getId();
    }

+    @NotNull
    @Override
    public String getNodeType() {
        return "rm.project";
    }

+    @NotNull
    @Override
    public String getNodeDisplayName() {
        return project.getDisplayName();
    }

+    @NotNull
    @Override
-    public String getLocalizedName(String locale) {
+    public String getLocalizedName(@NotNull String locale) {
        return getNodeDisplayName();
    }

+    @Nullable
    @Override
    public String getNodeDescription() {
        return project.getDescription();
    }

+    @Nullable
    @Override
    public DBPImage getNodeIcon() {
        return DBIcon.PROJECT;
@@ -90,6 +95,7 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
        return true;
    }

+    @Nullable
    @Override
    public DBNResourceManagerResource[] getChildren(@NotNull DBRProgressMonitor monitor) throws DBException {
        if (children == null && !monitor.isForceCacheUsage()) {
@@ -109,14 +115,16 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
        return ((DBNResourceManagerRoot) getParentNode()).getResourceController();
    }

+    @NotNull
    @Deprecated
    @Override
    public String getNodeItemPath() {
        return getParentNode().getNodeItemPath() + "/" + getName();
    }

+    @Nullable
    @Override
-    public DBNNode refreshNode(DBRProgressMonitor monitor, Object source) throws DBException {
+    public DBNNode refreshNode(@NotNull DBRProgressMonitor monitor, @Nullable Object source) throws DBException {
        children = null;
        return this;
    }
@@ -141,6 +149,7 @@ public class DBNResourceManagerProject extends DBNAbstractResourceManagerNode {
        return project;
    }

+    @NotNull
    @Override
    public String toString() {
        return getNodeDisplayName();
@@ -49,21 +49,25 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
        this.resource = resource;
    }

+    @NotNull
    @Override
    public String getNodeType() {
        return "rm.resource";
    }

+    @NotNull
    @Override
    public String getNodeDisplayName() {
        return resource.getName();
    }

+    @Nullable
    @Override
    public String getNodeDescription() {
        return null;
    }

+    @Nullable
    @Override
    public DBPImage getNodeIcon() {
        if (resource.isFolder()) {
@@ -109,6 +113,7 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
        return resource.isFolder();
    }

+    @Nullable
    @Override
    public DBNNode[] getChildren(@NotNull DBRProgressMonitor monitor) throws DBException {
        if (children == null && !monitor.isForceCacheUsage()) {
@@ -154,14 +159,16 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
        throw new DBException("Can't detect resource root node");
    }

+    @NotNull
    @Deprecated
    @Override
    public String getNodeItemPath() {
        return getParentNode().getNodeItemPath() + "/" + getNodeDisplayName();
    }

+    @Nullable
    @Override
-    public DBNNode refreshNode(DBRProgressMonitor monitor, Object source) throws DBException {
+    public DBNNode refreshNode(@NotNull DBRProgressMonitor monitor, @Nullable Object source) throws DBException {
        this.children = null;
        return super.refreshNode(monitor, source);
    }
@@ -171,7 +178,7 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
    }

    @Override
-    public void rename(DBRProgressMonitor monitor, String newName) throws DBException {
+    public void rename(@NotNull DBRProgressMonitor monitor, @NotNull String newName) throws DBException {
        String resourceName = resource.getName();
        try {
            if (newName.indexOf('.') == -1) {
@@ -192,6 +199,7 @@ public class DBNResourceManagerResource extends DBNAbstractResourceManagerNode {
        }
    }

+    @NotNull
    @Override
    public String toString() {
        return getNodeDisplayName();
@@ -50,6 +50,7 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
        return resourceController;
    }

+    @NotNull
    @Override
    public String getNodeType() {
        return "rm";
@@ -61,16 +62,19 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
        return "rm";
    }

+    @NotNull
    @Override
    public String getNodeDisplayName() {
        return "resources";
    }

+    @Nullable
    @Override
    public String getNodeDescription() {
        return "Resources";
    }

+    @Nullable
    @Override
    public DBPImage getNodeIcon() {
        return null;
@@ -81,6 +85,7 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
        return true;
    }

+    @Nullable
    @Override
    public DBNResourceManagerProject[] getChildren(@NotNull DBRProgressMonitor monitor) throws DBException {
        if (projects == null && !monitor.isForceCacheUsage()) {
@@ -110,6 +115,7 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
        return projects;
    }

+    @NotNull
    @Deprecated
    @Override
    public String getNodeItemPath() {
@@ -117,8 +123,9 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
        return NodePathType.ext.getPrefix() + getNodeDisplayName();
    }

+    @Nullable
    @Override
-    public DBNNode refreshNode(DBRProgressMonitor monitor, Object source) throws DBException {
+    public DBNNode refreshNode(@NotNull DBRProgressMonitor monitor, @Nullable Object source) throws DBException {
        projects = null;
        return this;
    }
@@ -141,6 +148,9 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
            case PROJECT_ADD:
                addProjectNode(event.getProject());
                break;
+            case PROJECT_UPDATE:
+                updateProjectNode(event.getProject());
+                break;
        }
    }

@@ -187,4 +197,14 @@ public class DBNResourceManagerRoot extends DBNNode implements DBPHiddenObject,
    private void addProjectNode(RMProject project) {
        projects = ArrayUtils.add(DBNResourceManagerProject.class, projects, new DBNResourceManagerProject(this, project));
    }
+
+    private void updateProjectNode(@NotNull RMProject project) {
+        var projectNode = getProjectNode(project);
+        projectNode.ifPresent(
+            dbnResourceManagerProject -> {
+                dbnResourceManagerProject.getProject().setName(project.getName());
+                dbnResourceManagerProject.getProject().setDescription(project.getDescription());
+            }
+        );
+    }
 }
@@ -1,6 +1,6 @@
 /*
 * DBeaver - Universal Database Manager
- * Copyright (C) 2010-2024 DBeaver Corp and others
+ * Copyright (C) 2010-2025 DBeaver Corp and others
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 package io.cloudbeaver.model.rm.local;

 import io.cloudbeaver.BaseWebProjectImpl;
-import io.cloudbeaver.model.rm.lock.RMFileLockController;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
@@ -28,6 +27,7 @@ import org.jkiss.dbeaver.model.DBPDataSourceFolder;
 import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.app.DBPProject;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
+import org.jkiss.dbeaver.model.fs.lock.FileLockController;
 import org.jkiss.dbeaver.model.impl.auth.SessionContextImpl;
 import org.jkiss.dbeaver.model.rm.RMController;
 import org.jkiss.dbeaver.model.rm.RMEvent;
@@ -57,11 +57,11 @@ public abstract class BaseLocalResourceController implements RMController {
    @NotNull
    protected final DBPWorkspace workspace;
    @NotNull
-    protected final RMFileLockController lockController;
+    protected final FileLockController lockController;

    protected BaseLocalResourceController(
        @NotNull DBPWorkspace workspace,
-        @NotNull RMFileLockController lockController
+        @NotNull FileLockController lockController
    ) {
        this.workspace = workspace;
        this.lockController = lockController;
@@ -99,7 +99,7 @@ public abstract class BaseLocalResourceController implements RMController {
        @NotNull String propName,
        @NotNull Object propValue
    ) throws DBException {
-        BaseWebProjectImpl webProject = getWebProject(projectId, false);
+        RMLocalProject webProject = getWebProject(projectId, false);
        doFileWriteOperation(projectId, webProject.getMetadataFilePath(),
            () -> {
                log.debug("Updating value for property '" + propName + "' in project '" + projectId + "'");
@@ -150,26 +150,36 @@ public abstract class BaseLocalResourceController implements RMController {
        @NotNull String configuration,
        @Nullable List<String> dataSourceIds
    ) throws DBException {
-        try (var lock = lockController.lockProject(projectId, "updateProjectDataSources")) {
+        return updateProjectDataSourcesConfig(projectId, configuration, dataSourceIds) != null;
+    }
+
+    @Nullable
+    protected DataSourceParseResults updateProjectDataSourcesConfig(
+        @NotNull String projectId,
+        @NotNull String configuration,
+        @Nullable List<String> dataSourceIds
+    ) throws DBException {
+        try (var lock = lockController.lock(projectId, "updateProjectDataSources")) {
            DBPProject project = getWebProject(projectId, false);
-            return doFileWriteOperation(projectId, project.getMetadataFolder(false),
+            return doFileWriteOperation(
+                projectId, project.getMetadataFolder(false),
                () -> {
                    DBPDataSourceRegistry registry = project.getDataSourceRegistry();
                    DBPDataSourceConfigurationStorage storage = new DataSourceMemoryStorage(configuration.getBytes(
                        StandardCharsets.UTF_8));
                    DataSourceConfigurationManager manager = new DataSourceConfigurationManagerBuffer();
-                    var configChanged = ((DataSourcePersistentRegistry) registry).loadDataSources(
+                    final DataSourceParseResults parseResults = ((DataSourcePersistentRegistry) registry).loadDataSources(
                        List.of(storage),
                        manager,
                        dataSourceIds,
                        true,
-                        false
+                        dataSourceIds == null
                    );
                    registry.checkForErrors();
                    log.debug("Save data sources configuration in project '" + projectId + "'");
                    ((DataSourcePersistentRegistry) registry).saveDataSources();
                    registry.checkForErrors();
-                    return configChanged;
+                    return parseResults;
                }
            );
        }
@@ -180,7 +190,7 @@ public abstract class BaseLocalResourceController implements RMController {
        @NotNull String projectId,
        @NotNull String[] dataSourceIds
    ) throws DBException {
-        try (var projectLock = lockController.lockProject(projectId, "deleteDatasources")) {
+        try (var projectLock = lockController.lock(projectId, "deleteDatasources")) {
            DBPProject project = getWebProject(projectId, false);
            doFileWriteOperation(projectId, project.getMetadataFolder(false), () -> {
                DBPDataSourceRegistry registry = project.getDataSourceRegistry();
@@ -205,7 +215,7 @@ public abstract class BaseLocalResourceController implements RMController {
        @NotNull String projectId,
        @NotNull String folderPath
    ) throws DBException {
-        try (var projectLock = lockController.lockProject(projectId, "createDatasourceFolder")) {
+        try (var projectLock = lockController.lock(projectId, "createDatasourceFolder")) {
            DBPProject project = getWebProject(projectId, false);
            log.debug("Creating data source folder '" + folderPath + "' in project '" + projectId + "'");
            doFileWriteOperation(projectId, project.getMetadataFolder(false),
@@ -217,6 +227,7 @@ public abstract class BaseLocalResourceController implements RMController {
                    var parent = result.getParent();
                    var parentFolder = parent == null ? null : registry.getFolder(parent.toString().replace("\\", "/"));
                    DBPDataSourceFolder newFolder = registry.addFolder(parentFolder, newName);
+                    ((DataSourcePersistentRegistry) registry).saveDataSources();
                    registry.checkForErrors();
                    return null;
                }
@@ -230,7 +241,7 @@ public abstract class BaseLocalResourceController implements RMController {
        @NotNull String[] folderPaths,
        boolean dropContents
    ) throws DBException {
-        try (var projectLock = lockController.lockProject(projectId, "createDatasourceFolder")) {
+        try (var projectLock = lockController.lock(projectId, "createDatasourceFolder")) {
            DBPProject project = getWebProject(projectId, false);
            doFileWriteOperation(projectId, project.getMetadataFolder(false),
                () -> {
@@ -244,6 +255,7 @@ public abstract class BaseLocalResourceController implements RMController {
                            log.warn("Can not find folder by path [" + folderPath + "] for deletion");
                        }
                    }
+                    ((DataSourcePersistentRegistry) registry).saveDataSources();
                    registry.checkForErrors();
                    return null;
                }
@@ -257,7 +269,7 @@ public abstract class BaseLocalResourceController implements RMController {
        @NotNull String oldPath,
        @NotNull String newPath
    ) throws DBException {
-        try (var projectLock = lockController.lockProject(projectId, "createDatasourceFolder")) {
+        try (var projectLock = lockController.lock(projectId, "createDatasourceFolder")) {
            DBPProject project = getWebProject(projectId, false);
            log.debug("Moving data source folder from '" + oldPath + "' to '" + newPath + "' in project '" + projectId + "'");
            doFileWriteOperation(projectId, project.getMetadataFolder(false),
@@ -265,13 +277,14 @@ public abstract class BaseLocalResourceController implements RMController {
                    DBPDataSourceRegistry registry = project.getDataSourceRegistry();
                    registry.moveFolder(oldPath, newPath);
                    registry.checkForErrors();
+                    ((DataSourcePersistentRegistry) registry).saveDataSources();
                    return null;
                }
            );
        }
    }

-    protected abstract BaseWebProjectImpl getWebProject(String projectId, boolean refresh) throws DBException;
+    protected abstract RMLocalProject getWebProject(String projectId, boolean refresh) throws DBException;

    protected abstract <T> T doFileWriteOperation(String projectId, Path file, RMFileOperation<T> operation)
        throws DBException;
@@ -16,42 +16,50 @@
 */
 package io.cloudbeaver.model.rm.local;

-import io.cloudbeaver.BaseWebProjectImpl;
 import io.cloudbeaver.DBWConstants;
 import io.cloudbeaver.model.app.ServletApplication;
-import io.cloudbeaver.model.rm.lock.RMFileLockController;
 import io.cloudbeaver.service.security.SMUtils;
 import io.cloudbeaver.service.sql.WebSQLConstants;
 import io.cloudbeaver.utils.ServletAppUtils;
+import io.cloudbeaver.utils.WebRMUtils;
 import io.cloudbeaver.utils.file.UniversalFileVisitor;
 import org.eclipse.core.runtime.IPath;
 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.DBPDataSourceContainer;
+import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
 import org.jkiss.dbeaver.model.app.DBPWorkspace;
 import org.jkiss.dbeaver.model.auth.SMCredentials;
 import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
+import org.jkiss.dbeaver.model.fs.lock.FileLockController;
 import org.jkiss.dbeaver.model.impl.app.BaseProjectImpl;
 import org.jkiss.dbeaver.model.impl.auth.SessionContextImpl;
+import org.jkiss.dbeaver.model.navigator.DBNLocalFolder;
 import org.jkiss.dbeaver.model.rm.*;
 import org.jkiss.dbeaver.model.security.SMController;
 import org.jkiss.dbeaver.model.security.SMObjectType;
 import org.jkiss.dbeaver.model.sql.DBQuotaException;
 import org.jkiss.dbeaver.model.websocket.event.MessageType;
 import org.jkiss.dbeaver.model.websocket.event.WSSessionLogUpdatedEvent;
+import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceEvent;
+import org.jkiss.dbeaver.model.websocket.event.datasource.WSDataSourceProperty;
+import org.jkiss.dbeaver.model.websocket.event.datasource.WSDatasourceFolderEvent;
+import org.jkiss.dbeaver.registry.DataSourceDescriptor;
+import org.jkiss.dbeaver.registry.DataSourceParseResults;
 import org.jkiss.dbeaver.registry.ResourceTypeDescriptor;
 import org.jkiss.dbeaver.registry.ResourceTypeRegistry;
 import org.jkiss.dbeaver.runtime.DBWorkbench;
 import org.jkiss.utils.CommonUtils;
 import org.jkiss.utils.IOUtils;
 import org.jkiss.utils.Pair;
+import org.jkiss.utils.StandardConstants;

 import java.io.IOException;
 import java.nio.file.*;
 import java.text.MessageFormat;
 import java.time.OffsetDateTime;
-import java.time.ZoneId;
 import java.util.*;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -73,7 +81,7 @@ public class LocalResourceController extends BaseLocalResourceController {
    private Supplier<SMController> smControllerSupplier;
    protected final List<RMFileOperationHandler> fileHandlers;

-    private final Map<String, BaseWebProjectImpl> projectRegistries = new LinkedHashMap<>();
+    private final Map<String, RMLocalProject> projectRegistries = new LinkedHashMap<>();

    public LocalResourceController(
        DBPWorkspace workspace,
@@ -83,7 +91,7 @@ public class LocalResourceController extends BaseLocalResourceController {
        Path sharedProjectsPath,
        Supplier<SMController> smControllerSupplier
    ) throws DBException {
-        super(workspace, new RMFileLockController(ServletAppUtils.getServletApplication()));
+        super(workspace, new FileLockController(ServletAppUtils.getServletApplication().getApplicationInstanceId()));
        this.credentialsProvider = credentialsProvider;
        this.rootPath = rootPath;
        this.userProjectsPath = userProjectsPath;
@@ -108,13 +116,11 @@ public class LocalResourceController extends BaseLocalResourceController {
        return userId == null ? null : this.userProjectsPath.resolve(userId);
    }

-    protected BaseWebProjectImpl getWebProject(String projectId, boolean refresh) throws DBException {
+    protected RMLocalProject getWebProject(String projectId, boolean refresh) throws DBException {
        synchronized (projectRegistries) {
-            BaseWebProjectImpl project = projectRegistries.get(projectId);
+            RMLocalProject project = projectRegistries.get(projectId);
            if (project == null || refresh) {
-                SessionContextImpl sessionContext = new SessionContextImpl(null);
-                RMProject rmProject = makeProjectFromId(projectId, false);
-                project = createWebProjectImpl(projectId, sessionContext, rmProject);
+                project = createWebProjectImpl(projectId, new SessionContextImpl(null));
                projectRegistries.put(projectId, project);
            }
            return project;
@@ -122,12 +128,11 @@ public class LocalResourceController extends BaseLocalResourceController {
    }

    @NotNull
-    protected InternalWebProjectImpl createWebProjectImpl(
-        String projectId,
-        SessionContextImpl sessionContext,
-        RMProject rmProject
+    protected RMLocalProject createWebProjectImpl(
+        @NotNull String projectId,
+        @NotNull SessionContextImpl sessionContext
    ) throws DBException {
-        return new InternalWebProjectImpl(sessionContext, rmProject, getProjectPath(projectId));
+        return new RMLocalProject(workspace, sessionContext, getProjectPath(projectId), WebRMUtils.parseProjectName(projectId).getType());
    }

    @NotNull
@@ -182,7 +187,7 @@ public class LocalResourceController extends BaseLocalResourceController {
            .stream()
            .filter(smObjectPermissions -> CommonUtils.isNotEmpty(smObjectPermissions.getObjectId()))
            .map(projectPermission -> makeProjectFromPath(
-                sharedProjectsPath.resolve(parseProjectNameUnsafe(projectPermission.getObjectId()).getName()),
+                sharedProjectsPath.resolve(WebRMUtils.parseProjectNameUnsafe(projectPermission.getObjectId()).getName()),
                Arrays.stream(projectPermission.getPermissions()).map(RMProjectPermission::fromPermission).collect(Collectors.toSet()),
                RMProjectType.SHARED, true)
            )
@@ -248,7 +253,7 @@ public class LocalResourceController extends BaseLocalResourceController {
                var allPaths = list.toList();
                for (Path path : allPaths) {
                    var projectPerms = getProjectPermissions(
-                        makeProjectIdFromPath(path, RMProjectType.SHARED),
+                        RMUtils.makeProjectIdFromPath(path, RMProjectType.SHARED),
                        RMProjectType.SHARED
                    );
                    var rmProject = makeProjectFromPath(path, projectPerms, RMProjectType.SHARED, false);
@@ -273,31 +278,57 @@ public class LocalResourceController extends BaseLocalResourceController {
            }
        }
        validateResourcePath(name);
-        RMProject project;
+        validateProjectName(null, name);
        var projectPath = sharedProjectsPath.resolve(name);
        if (Files.exists(projectPath)) {
            throw new DBException("Project '" + name + "' already exists");
        }
-        project = makeProjectFromPath(projectPath, Set.of(), RMProjectType.SHARED, false);
-        if (project == null) {
-            throw new DBException("Project '" + name + "' not created");
-        }
+        RMLocalProject webProject = new RMLocalProject(workspace, new SessionContextImpl(null), projectPath, RMProjectType.SHARED);
+        webProject.updateProject(name, description);
+        RMProject rmProject = createRmProjectFromWebProject(projectPath, webProject, new String[0]);
        try {
-            log.debug("Creating project '" + project.getId() + "'");
+            log.debug("Creating project '" + rmProject.getId() + "'");
            Files.createDirectories(projectPath);
            if (ServletAppUtils.getServletApplication().isMultiNode()) {
                createResourceTypeFolders(projectPath);
            }
-            fireRmProjectAddEvent(project);
-            return project;
+            fireRmProjectAddEvent(rmProject);
+            return rmProject;
        } catch (IOException e) {
            throw new DBException("Error creating project path", e);
        }
    }

+    @Override
+    public RMProject updateProject(@NotNull String projectId, @NotNull RMProjectInfo projectInfo) throws DBException {
+        validateProjectName(projectId, projectInfo.getName());
+        try (var projectLock = lockController.lock(projectId, "updateProject")) {
+            RMLocalProject project = getWebProject(projectId, false);
+            Path targetPath = getProjectPath(projectId);
+            if (!Files.exists(targetPath)) {
+                throw new DBException("Project folder '" + projectId + "' not found");
+            }
+            if (!project.canUpdateProjectName()) {
+                throw new DBException("Project '" + projectId + "' is not shared");
+            }
+            project.updateProject(projectInfo.getName(), projectInfo.getDescription());
+            return WebRMUtils.createRmProjectFromWebProject(project);
+        }
+    }
+
+    private void validateProjectName(@Nullable String projectId, @Nullable String name) throws DBException {
+        boolean duplicatedName = Arrays.stream(listAllSharedProjects())
+            .filter(p -> !p.getId().equals(projectId))
+            .map(RMProject::getName)
+            .noneMatch(n -> n.equalsIgnoreCase(name));
+        if (!duplicatedName) {
+            throw new DBException("Project name '" + name + "' is already used");
+        }
+    }
+
    @Override
    public void deleteProject(@NotNull String projectId) throws DBException {
-        try (var projectLock = lockController.lockProject(projectId, "deleteProject")) {
+        try (var projectLock = lockController.lock(projectId, "deleteProject")) {
            RMProject project = makeProjectFromId(projectId, false);
            Path targetPath = getProjectPath(projectId);
            if (!Files.exists(targetPath)) {
@@ -334,6 +365,239 @@ public class LocalResourceController extends BaseLocalResourceController {
        return project;
    }

+    @Override
+    public void createProjectDataSources(
+        @NotNull String projectId,
+        @NotNull String configuration,
+        @Nullable List<String> dataSourceIds
+    ) throws DBException {
+        super.createProjectDataSources(projectId, configuration, dataSourceIds);
+        if (credentialsProvider.getActiveUserCredentials() != null && dataSourceIds != null) {
+            ServletAppUtils.getServletApplication().getEventController().addEvent(
+                WSDataSourceEvent.create(
+                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
+                    credentialsProvider.getActiveUserCredentials().getUserId(),
+                    projectId,
+                    dataSourceIds,
+                    WSDataSourceProperty.CONFIGURATION
+                )
+            );
+        }
+    }
+
+    @Override
+    public boolean updateProjectDataSources(
+        @NotNull String projectId,
+        @NotNull String configuration,
+        @Nullable List<String> dataSourceIds
+    ) throws DBException {
+        DBPDataSourceRegistry registry = getWebProject(projectId, false).getDataSourceRegistry();
+        Map<String, DataSourceDescriptor> oldDataSources = registry.getDataSources().stream()
+            .filter(ds -> dataSourceIds == null || dataSourceIds.contains(ds.getId()))
+            .collect(Collectors.toMap(
+                    DBPDataSourceContainer::getId,
+                    registry::createDataSource
+                )
+            );
+        DataSourceParseResults parseResults = super.updateProjectDataSourcesConfig(projectId, configuration, dataSourceIds);
+        sendDataSourcesConfigUpdatedEvent(registry, oldDataSources, parseResults);
+        return parseResults != null;
+    }
+
+    @Override
+    public void deleteProjectDataSources(@NotNull String projectId, @NotNull String[] dataSourceIds) throws DBException {
+        super.deleteProjectDataSources(projectId, dataSourceIds);
+        if (credentialsProvider.getActiveUserCredentials() != null && dataSourceIds.length > 0) {
+            ServletAppUtils.getServletApplication().getEventController().addEvent(
+                WSDataSourceEvent.delete(
+                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
+                    credentialsProvider.getActiveUserCredentials().getUserId(),
+                    projectId,
+                    Arrays.asList(dataSourceIds),
+                    WSDataSourceProperty.CONFIGURATION
+                )
+            );
+        }
+    }
+
+    @Override
+    public void createProjectDataSourceFolder(@NotNull String projectId, @NotNull String folderPath) throws DBException {
+        super.createProjectDataSourceFolder(projectId, folderPath);
+        if (credentialsProvider.getActiveUserCredentials() != null) {
+            ServletAppUtils.getServletApplication().getEventController().addEvent(
+                WSDatasourceFolderEvent.create(
+                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
+                    credentialsProvider.getActiveUserCredentials().getUserId(),
+                    projectId,
+                    List.of(createNodePathFromFolderPath(projectId, folderPath))
+                )
+            );
+        }
+    }
+
+    @Override
+    public void moveProjectDataSourceFolder(
+        @NotNull String projectId,
+        @NotNull String oldPath,
+        @NotNull String newPath
+    ) throws DBException {
+        super.moveProjectDataSourceFolder(projectId, oldPath, newPath);
+        if (credentialsProvider.getActiveUserCredentials() != null) {
+            ServletAppUtils.getServletApplication().getEventController().addEvent(
+                WSDatasourceFolderEvent.delete(
+                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
+                    credentialsProvider.getActiveUserCredentials().getUserId(),
+                    projectId,
+                    List.of(createNodePathFromFolderPath(projectId, oldPath))
+                )
+            );
+            ServletAppUtils.getServletApplication().getEventController().addEvent(
+                WSDatasourceFolderEvent.create(
+                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
+                    credentialsProvider.getActiveUserCredentials().getUserId(),
+                    projectId,
+                    List.of(createNodePathFromFolderPath(projectId, newPath))
+                )
+            );
+        }
+    }
+
+    @Override
+    public void deleteProjectDataSourceFolders(@NotNull String projectId, @NotNull String[] folderPaths, boolean dropContents)
+    throws DBException {
+        super.deleteProjectDataSourceFolders(projectId, folderPaths, dropContents);
+        if (credentialsProvider.getActiveUserCredentials() != null) {
+            ServletAppUtils.getServletApplication().getEventController().addEvent(
+                WSDatasourceFolderEvent.create(
+                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
+                    credentialsProvider.getActiveUserCredentials().getUserId(),
+                    projectId,
+                    Arrays.stream(folderPaths).map(
+                        p -> createNodePathFromFolderPath(projectId, p)
+                    ).collect(Collectors.toList())
+                )
+            );
+        }
+    }
+
+    private String createNodePathFromFolderPath(String projectId, String folderPath) {
+        return DBNLocalFolder.makeLocalFolderItemPath(projectId, folderPath);
+    }
+
+    private void sendDataSourcesConfigUpdatedEvent(
+        @NotNull DBPDataSourceRegistry registry,
+        @NotNull Map<String, DataSourceDescriptor> oldDataSources,
+        @Nullable DataSourceParseResults parseResults
+    ) {
+        if (parseResults == null || credentialsProvider.getActiveUserCredentials() == null || oldDataSources.isEmpty()) {
+            return;
+        }
+        List<String> updatedConfigurationDataSourceIds = new ArrayList<>();
+        List<String> updatedNameDataSourceIds = new ArrayList<>();
+        List<String> updatedInternalConfigurationDataSourceIds = new ArrayList<>();
+
+        for (Map.Entry<String, DataSourceDescriptor> entry : oldDataSources.entrySet()) {
+            String dsId = entry.getKey();
+            DataSourceDescriptor oldDs = entry.getValue();
+            DataSourceDescriptor newDs = (DataSourceDescriptor) registry.getDataSource(dsId);
+            if (newDs == null) {
+                continue;
+            }
+            if (!oldDs.equalConfiguration(newDs)) {
+                updatedConfigurationDataSourceIds.add(dsId);
+            } else if (!oldDs.isLooselyEqualTo(newDs)) {
+                updatedNameDataSourceIds.add(dsId);
+            } else if (!oldDs.equalInternalConfiguration(newDs)) {
+                updatedInternalConfigurationDataSourceIds.add(dsId);
+            }
+        }
+
+        if (!updatedConfigurationDataSourceIds.isEmpty()) {
+            ServletAppUtils.getServletApplication().getEventController().addEvent(
+                WSDataSourceEvent.update(
+                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
+                    credentialsProvider.getActiveUserCredentials().getUserId(),
+                    registry.getProject().getId(),
+                    updatedConfigurationDataSourceIds,
+                    WSDataSourceProperty.CONFIGURATION
+                )
+            );
+        }
+        if (!updatedNameDataSourceIds.isEmpty()) {
+            ServletAppUtils.getServletApplication().getEventController().addEvent(
+                WSDataSourceEvent.update(
+                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
+                    credentialsProvider.getActiveUserCredentials().getUserId(),
+                    registry.getProject().getId(),
+                    updatedNameDataSourceIds,
+                    WSDataSourceProperty.NAME
+                )
+            );
+        }
+        if (!updatedInternalConfigurationDataSourceIds.isEmpty()) {
+            ServletAppUtils.getServletApplication().getEventController().addEvent(
+                WSDataSourceEvent.update(
+                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
+                    credentialsProvider.getActiveUserCredentials().getUserId(),
+                    registry.getProject().getId(),
+                    updatedInternalConfigurationDataSourceIds,
+                    WSDataSourceProperty.INTERNAL
+                )
+            );
+        }
+
+        if (!parseResults.addedDataSources.isEmpty()) {
+            ServletAppUtils.getServletApplication().getEventController().addEvent(
+                WSDataSourceEvent.create(
+                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
+                    credentialsProvider.getActiveUserCredentials().getUserId(),
+                    registry.getProject().getId(),
+                    updatedNameDataSourceIds,
+                    WSDataSourceProperty.CONFIGURATION
+                )
+            );
+        }
+
+        if (!parseResults.removedDataSources.isEmpty()) {
+            ServletAppUtils.getServletApplication().getEventController().addEvent(
+                WSDataSourceEvent.delete(
+                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
+                    credentialsProvider.getActiveUserCredentials().getUserId(),
+                    registry.getProject().getId(),
+                    updatedNameDataSourceIds,
+                    WSDataSourceProperty.CONFIGURATION
+                )
+            );
+        }
+
+        if (!parseResults.addedFolders.isEmpty()) {
+            ServletAppUtils.getServletApplication().getEventController().addEvent(
+                WSDatasourceFolderEvent.create(
+                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
+                    credentialsProvider.getActiveUserCredentials().getUserId(),
+                    registry.getProject().getId(),
+                    parseResults.addedFolders.stream().map(
+                        f -> createNodePathFromFolderPath(registry.getProject().getId(), f.getFolderPath())
+                    ).toList()
+                )
+            );
+        }
+
+        if (!parseResults.removedFolders.isEmpty()) {
+            ServletAppUtils.getServletApplication().getEventController().addEvent(
+                WSDatasourceFolderEvent.delete(
+                    credentialsProvider.getActiveUserCredentials().getSmSessionId(),
+                    credentialsProvider.getActiveUserCredentials().getUserId(),
+                    registry.getProject().getId(),
+                    parseResults.removedFolders.stream().map(
+                        f -> createNodePathFromFolderPath(registry.getProject().getId(), f.getFolderPath())
+                    ).toList()
+                )
+            );
+        }
+
+    }
+
    @NotNull
    @Override
    public RMResource[] listResources(
@@ -395,7 +659,7 @@ public class LocalResourceController extends BaseLocalResourceController {
        @NotNull String resourcePath,
        boolean isFolder
    ) throws DBException {
-        try (var ignoredLock = lockController.lockProject(projectId, "createResource")) {
+        try (var ignoredLock = lockController.lock(projectId, "createResource")) {
            validateResourcePath(resourcePath);
            Path targetPath = getTargetPath(projectId, resourcePath);
            if (Files.exists(targetPath)) {
@@ -427,7 +691,7 @@ public class LocalResourceController extends BaseLocalResourceController {
        @NotNull String oldResourcePath,
        @NotNull String newResourcePath
    ) throws DBException {
-        try (var ignoredLock = lockController.lockProject(projectId, "moveResource")) {
+        try (var ignoredLock = lockController.lock(projectId, "moveResource")) {
            var normalizedOldResourcePath = CommonUtils.normalizeResourcePath(oldResourcePath);
            var normalizedNewResourcePath = CommonUtils.normalizeResourcePath(newResourcePath);
            if (log.isDebugEnabled()) {
@@ -499,7 +763,7 @@ public class LocalResourceController extends BaseLocalResourceController {

    @Override
    public void deleteResource(@NotNull String projectId, @NotNull String resourcePath, boolean recursive) throws DBException {
-        try (var ignoredLock = lockController.lockProject(projectId, "deleteResource")) {
+        try (var ignoredLock = lockController.lock(projectId, "deleteResource")) {
            if (log.isDebugEnabled()) {
                log.debug("Removing resource from '" + resourcePath + "' in project '" + projectId + "'" + (recursive ? " recursive" : ""));
            }
@@ -587,7 +851,7 @@ public class LocalResourceController extends BaseLocalResourceController {
        @NotNull byte[] data,
        boolean forceOverwrite
    ) throws DBException {
-        try (var ignoredLock = lockController.lockProject(projectId, "setResourceContents")) {
+        try (var ignoredLock = lockController.lock(projectId, "setResourceContents")) {
            validateResourcePath(resourcePath);
            Number fileSizeLimit = ServletAppUtils.getServletApplication()
                .getAppConfiguration()
@@ -632,9 +896,9 @@ public class LocalResourceController extends BaseLocalResourceController {
        @NotNull String propertyName,
        @Nullable Object propertyValue
    ) throws DBException {
-        try (var ignoredLock = lockController.lockProject(projectId, "resourcePropertyUpdate")) {
+        try (var ignoredLock = lockController.lock(projectId, "resourcePropertyUpdate")) {
            validateResourcePath(resourcePath);
-            BaseWebProjectImpl webProject = getWebProject(projectId, false);
+            RMLocalProject webProject = getWebProject(projectId, false);
            doFileWriteOperation(projectId, webProject.getMetadataFilePath(),
                () -> {
                    log.debug("Updating resource property '" + propertyName + "' in project '" + projectId + "'");
@@ -653,9 +917,9 @@ public class LocalResourceController extends BaseLocalResourceController {
        @NotNull String resourcePath,
        @NotNull Map<String, Object> properties
    ) throws DBException {
-        try (var ignoredLock = lockController.lockProject(projectId, "resourcePropertyUpdate")) {
+        try (var ignoredLock = lockController.lock(projectId, "resourcePropertyUpdate")) {
            validateResourcePath(resourcePath);
-            BaseWebProjectImpl webProject = getWebProject(projectId, false);
+            RMLocalProject webProject = getWebProject(projectId, false);
            doFileWriteOperation(projectId, webProject.getMetadataFilePath(),
                () -> {
                    log.debug("Updating resource '" + resourcePath + "' properties in project '" + projectId + "'");
@@ -689,15 +953,9 @@ public class LocalResourceController extends BaseLocalResourceController {
        }
    }

-
-    private String makeProjectIdFromPath(Path path, RMProjectType type) {
-        String projectName = path.getFileName().toString();
-        return type.getPrefix() + "_" + projectName;
-    }
-
    @Nullable
    protected RMProject makeProjectFromId(String projectId, boolean loadPermissions) throws DBException {
-        var projectName = parseProjectName(projectId);
+        var projectName = WebRMUtils.parseProjectName(projectId);
        var projectPath = getProjectPath(projectId);
        if (!Files.exists(projectPath)) {
            if (isPrivateProject(projectId) && isProjectOwner(projectId)) {
@@ -734,28 +992,8 @@ public class LocalResourceController extends BaseLocalResourceController {
            .flatMap(rmProjectPermission -> rmProjectPermission.getAllPermissions().stream())
            .toArray(String[]::new);

-        RMProject project = new RMProject();
-        String projectName = path.getFileName().toString();
-        project.setName(projectName);
-        project.setId(makeProjectIdFromPath(path, type));
-        project.setType(type);
-        project.setProjectPermissions(allProjectPermissions);
-        if (Files.exists(path)) {
-            try {
-                project.setCreateTime(
-                    OffsetDateTime.ofInstant(Files.getLastModifiedTime(path).toInstant(), ZoneId.of("UTC")).toInstant().toEpochMilli());
-            } catch (IOException e) {
-                log.error(e);
-            }
-        }
-        // Resource types
-        project.setResourceTypes(ResourceTypeRegistry.getInstance().getResourceTypes()
-            .stream()
-            .filter(ResourceTypeDescriptor::isManagable)
-            .map(RMResourceType::new)
-            .toArray(RMResourceType[]::new));
-
-        return project;
+        RMLocalProject webProject = new RMLocalProject(workspace, new SessionContextImpl(null), path, type);
+        return createRmProjectFromWebProject(path, webProject, allProjectPermissions);
    }

    private void createResourceTypeFolders(Path path) {
@@ -834,7 +1072,7 @@ public class LocalResourceController extends BaseLocalResourceController {
    }

    protected Path getProjectPath(String projectId) throws DBException {
-        RMProjectName project = parseProjectName(projectId);
+        RMProjectName project = WebRMUtils.parseProjectName(projectId);
        RMProjectType type = project.getType();
        String projectName = project.getName();
        switch (type) {
@@ -996,56 +1234,13 @@ public class LocalResourceController extends BaseLocalResourceController {
        }
    }

-    public static class RMProjectName {
-        String prefix;
-        String name;
-
-        private RMProjectName(String prefix, String name) {
-            this.prefix = prefix;
-            this.name = name;
-        }
-
-        public String getPrefix() {
-            return prefix;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public RMProjectType getType() {
-            return RMProjectType.getByPrefix(prefix);
-        }
-    }
-
-    public static RMProjectName parseProjectName(String projectId) throws DBException {
-        if (CommonUtils.isEmpty(projectId)) {
-            throw new DBException("Project id is empty");
-        }
-        return parseProjectNameUnsafe(projectId);
-    }
-
-    private static RMProjectName parseProjectNameUnsafe(String projectId) {
-        String prefix;
-        String name;
-        int divPos = projectId.indexOf("_");
-        if (divPos < 0) {
-            prefix = RMProjectType.USER.getPrefix();
-            name = projectId;
-        } else {
-            prefix = projectId.substring(0, divPos);
-            name = projectId.substring(divPos + 1);
-        }
-        return new RMProjectName(prefix, name);
-    }
-
    public static boolean isGlobalProject(String projectId) {
-        RMProjectName rmProjectName = parseProjectNameUnsafe(projectId);
+        RMProjectName rmProjectName = WebRMUtils.parseProjectNameUnsafe(projectId);
        return RMProjectType.GLOBAL.getPrefix().equals(rmProjectName.getPrefix());
    }

    public static boolean isPrivateProject(String projectId) {
-        RMProjectName rmProjectName = parseProjectNameUnsafe(projectId);
+        RMProjectName rmProjectName = WebRMUtils.parseProjectNameUnsafe(projectId);
        return RMProjectType.USER.getPrefix().equals(rmProjectName.getPrefix());
    }

@@ -1056,9 +1251,34 @@ public class LocalResourceController extends BaseLocalResourceController {
    }

    public static boolean isProjectOwner(String projectId, String userId) {
-        RMProjectName rmProjectName = parseProjectNameUnsafe(projectId);
+        RMProjectName rmProjectName = WebRMUtils.parseProjectNameUnsafe(projectId);
        return RMProjectType.USER.getPrefix().equals(rmProjectName.getPrefix()) &&
            rmProjectName.name.equals(userId);
    }

+    @NotNull
+    private static RMProject createRmProjectFromWebProject(Path path, RMLocalProject webProject, String[] allProjectPermissions) {
+        RMProject project = WebRMUtils.createRmProjectFromWebProject(webProject);
+        project.setProjectPermissions(allProjectPermissions);
+        if (Files.exists(path)) {
+            try {
+                project.setCreateTime(OffsetDateTime.ofInstant(
+                    Files.getLastModifiedTime(path).toInstant(),
+                    StandardConstants.ZONE_ID_UTC
+                ).toInstant().toEpochMilli());
+            } catch (IOException e) {
+                log.error(e);
+            }
+        }
+        // Resource types
+        project.setResourceTypes(ResourceTypeRegistry.getInstance().getResourceTypes()
+            .stream()
+            .filter(ResourceTypeDescriptor::isManageable)
+            .map(RMResourceType::new)
+            .toArray(RMResourceType[]::new));
+
+        return project;
+    }
+
+
 }
@@ -0,0 +1,58 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.rm.local;
+
+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.rm.RMProjectType;
+import org.jkiss.dbeaver.model.rm.RMUtils;
+import org.jkiss.dbeaver.registry.project.LocalProjectImpl;
+
+import java.nio.file.Path;
+
+public class RMLocalProject extends LocalProjectImpl {
+    @NotNull
+    private final RMProjectType projectType;
+
+    public RMLocalProject(
+        @NotNull DBPWorkspace workspace,
+        @Nullable SMSessionContext sessionContext,
+        @NotNull Path projectPath,
+        @NotNull RMProjectType type
+    ) {
+        super(workspace, sessionContext, projectPath);
+        this.projectType = type;
+    }
+
+    @Override
+    public boolean isVirtual() {
+        return true;
+    }
+
+    @NotNull
+    @Override
+    public String getId() {
+        return RMUtils.makeProjectIdFromPath(projectPath, projectType);
+    }
+
+
+    public boolean canUpdateProjectName() {
+        return RMProjectType.SHARED.equals(projectType);
+    }
+}
@@ -0,0 +1,41 @@
+/*
+ * DBeaver - Universal Database Manager
+ * Copyright (C) 2010-2025 DBeaver Corp and others
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.cloudbeaver.model.rm.local;
+
+import org.jkiss.dbeaver.model.rm.RMProjectType;
+
+public class RMProjectName {
+    String prefix;
+    String name;
+
+    public RMProjectName(String prefix, String name) {
+        this.prefix = prefix;
+        this.name = name;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public RMProjectType getType() {
+        return RMProjectType.getByPrefix(prefix);
+    }
+}
@@ -1,269 +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.rm.lock;
-
-import com.google.gson.Gson;
-import io.cloudbeaver.model.app.ServletApplication;
-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.DBPWorkspace;
-import org.jkiss.utils.IOUtils;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.UUID;
-
-/**
- * File based resource locks
- */
-public class RMFileLockController {
-    private static final Log log = Log.getLog(RMFileLockController.class);
-    private static final int DEFAULT_MAX_LOCK_TIME = 1 * 60 * 1000; // 1 min
-    private static final int CHECK_PERIOD = 10;
-
-    private static final String LOCK_META_FOLDER = ".locks";
-    private static final String LOCK_FILE_EXTENSION = ".lock";
-
-    private final Gson gson = new Gson();
-
-    private final Path lockFolderPath;
-    private final String applicationId;
-    private final int maxLockTime;
-
-
-    public RMFileLockController(ServletApplication application) throws DBException {
-        this(application, DEFAULT_MAX_LOCK_TIME);
-    }
-
-    // for tests
-    public RMFileLockController(ServletApplication application, int maxLockTime) throws DBException {
-        this.lockFolderPath = application.getWorkspaceDirectory()
-            .resolve(DBPWorkspace.METADATA_FOLDER)
-            .resolve(LOCK_META_FOLDER);
-        this.applicationId = application.getApplicationInstanceId();
-        this.maxLockTime = maxLockTime;
-    }
-
-    /**
-     * Lock the project for the duration of any operation.
-     * Other threads/processes will also see this lock, and will wait for it to end
-     * or force intercept lock, if the operation will take too long and
-     * exceeds the maximum available locking time {@link #maxLockTime} or the lock is invalid {@link #awaitUnlock)}.
-     *
-     * @param projectId     - project to be locked
-     * @param operationName - executed operation name
-     * @return - lock
-     */
-    @NotNull
-    public RMLock lockProject(@NotNull String projectId, @NotNull String operationName) throws DBException {
-        synchronized (RMFileLockController.class) {
-            try {
-                RMLockInfo lockInfo = new RMLockInfo.Builder(projectId, UUID.randomUUID().toString())
-                    .setApplicationId(applicationId)
-                    .setOperationName(operationName)
-                    .setOperationStartTime(System.currentTimeMillis())
-                    .build();
-                Path projectLockFile = getProjectLockFilePath(projectId);
-
-                if (!IOUtils.isFileFromDefaultFS(lockFolderPath)) {
-                    // fake lock for external file system?
-                    return new RMLock(projectLockFile);
-                }
-                createLockFolderIfNeeded();
-                createProjectFolder(projectId);
-
-                createLockFile(projectLockFile, lockInfo);
-                return new RMLock(projectLockFile);
-            } catch (Exception e) {
-                throw new DBException("Failed to lock project: " + projectId, e);
-            }
-        }
-    }
-
-    /**
-     * if the project is already locked, the operation will be executed as a child of the first lock,
-     * otherwise it creates its own lock.
-     *
-     * @param projectId     - project to be locked
-     * @param operationName - executed operation name
-     * @return - lock
-     */
-    @Nullable
-    public RMLock lockIfNotLocked(@NotNull String projectId, @NotNull String operationName) throws DBException {
-        synchronized (RMFileLockController.class) {
-            if (isProjectLocked(projectId)) {
-                return null;
-            }
-            return lockProject(projectId, operationName);
-        }
-    }
-
-    /**
-     * Check that project locked
-     */
-    public boolean isProjectLocked(String projectId) {
-        Path projectLockFilePath = getProjectLockFilePath(projectId);
-        return isLocked(projectLockFilePath);
-    }
-
-    protected boolean isLocked(Path lockFilePath) {
-        return Files.exists(lockFilePath);
-    }
-
-    private void createLockFile(Path projectLockFile, RMLockInfo lockInfo) throws DBException, InterruptedException {
-        boolean lockFileCreated = false;
-        while (!lockFileCreated) {
-            if (Files.exists(projectLockFile)) {
-                awaitUnlock(lockInfo.getProjectId(), projectLockFile);
-            }
-            try {
-                Files.createFile(projectLockFile);
-                lockFileCreated = true;
-            } catch (IOException e) {
-                if (Files.exists(projectLockFile)) {
-                    log.info("Looks like file was locked by another rm instance at the same time");
-                    continue;
-                } else {
-                    throw new DBException("Failed to create lock file: " + projectLockFile, e);
-                }
-            }
-
-            try {
-                Files.write(projectLockFile, gson.toJson(lockInfo).getBytes(StandardCharsets.UTF_8));
-            } catch (IOException e) {
-                log.error("Failed to write lock info, unlock project: " + lockInfo.getProjectId());
-                try {
-                    Files.deleteIfExists(lockFolderPath);
-                } catch (IOException ex) {
-                    throw new DBException("Failed to remove invalid lock file: " + projectLockFile, ex);
-                }
-                throw new DBException("Failed to lock project: " + lockInfo.getProjectId(), e);
-            }
-        }
-
-    }
-
-    private void createProjectFolder(String projectId) throws DBException {
-        Path projectLocksFolder = lockFolderPath.resolve(projectId);
-        if (Files.exists(projectLocksFolder)) {
-            return;
-        }
-        try {
-            Files.createDirectories(projectLocksFolder);
-        } catch (Exception e) {
-            if (Files.exists(projectLocksFolder)) {
-                // ignore, because file can be created by another server
-            } else {
-                throw new DBException("Failed to create project lock folder: " + projectId, e);
-            }
-        }
-    }
-
-    protected void awaitUnlock(String projectId, Path projectLockFile) throws InterruptedException, DBException {
-        if (!isLocked(projectLockFile)) {
-            return;
-        }
-        awaitingUnlock(projectId, projectLockFile);
-    }
-
-    protected void awaitingUnlock(String projectId, Path projectLockFile) throws DBException, InterruptedException {
-        log.info("Waiting for a file to be unlocked: " + projectLockFile);
-        RMLockInfo originalLockInfo = readLockInfo(projectId, projectLockFile);
-        boolean fileUnlocked = originalLockInfo == null; //lock can be removed at the moment when we try to read lock file info
-        int maxIterations = maxLockTime / CHECK_PERIOD;
-        int currentCheckCount = 0;
-
-        while (!fileUnlocked) {
-            fileUnlocked = !isLocked(projectLockFile);
-            if (currentCheckCount >= maxIterations || fileUnlocked) {
-                break;
-            }
-            if (originalLockInfo != null & originalLockInfo.isBlank()) {
-                // possible in situation where the project has just been locked
-                // and the lock information has not yet been written
-                originalLockInfo = readLockInfo(projectId, projectLockFile);
-            }
-            currentCheckCount++;
-            Thread.sleep(CHECK_PERIOD);
-        }
-        if (fileUnlocked) {
-            return;
-        }
-
-        RMLockInfo currentLockInfo = readLockInfo(projectId, projectLockFile);
-        if (currentLockInfo == null) {
-            // file unlocked now
-            return;
-        }
-
-        //checking that this is not a new lock from another operation
-        if (originalLockInfo.getOperationId().equals(currentLockInfo.getOperationId())) {
-            forceUnlock(projectLockFile);
-        } else {
-            awaitUnlock(projectId, lockFolderPath);
-        }
-    }
-
-    protected void forceUnlock(Path projectLockFile) {
-        // something went wrong and lock is invalid
-        log.warn("File has not been unlocked within the expected period, force unlock");
-        try {
-            Files.deleteIfExists(projectLockFile);
-        } catch (IOException e) {
-            log.error(e);
-        }
-    }
-
-    @Nullable
-    /**
-     @return
-     - null if lock not exist;
-     - empty lock info if the lock has just been created and the information has not yet been written;
-     - lock info
-     */
-    private RMLockInfo readLockInfo(String projectId, Path projectLockFile) throws DBException {
-        if (Files.notExists(projectLockFile)) {
-            return null;
-        }
-        try (Reader reader = Files.newBufferedReader(projectLockFile, StandardCharsets.UTF_8)) {
-            return gson.fromJson(reader, RMLockInfo.class);
-        } catch (IOException e) {
-            if (!isLocked(projectLockFile)) {
-                return null;
-            }
-            log.warn("Failed to read lock file info, but lock file still exist: " + projectLockFile);
-            return RMLockInfo.emptyLock(projectId);
-        }
-    }
-
-    private Path getProjectLockFilePath(String projectId) {
-        return lockFolderPath.resolve(projectId).resolve(projectId + LOCK_FILE_EXTENSION);
-    }
-
-    private void createLockFolderIfNeeded() throws IOException {
-        synchronized (RMFileLockController.class) {
-            if (Files.notExists(lockFolderPath)) {
-                Files.createDirectories(lockFolderPath);
-            }
-        }
-    }
-}
@@ -1,63 +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.rm.lock;
-
-import org.jkiss.dbeaver.Log;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-/**
- * Resource Manager resource lock
- */
-public class RMLock implements AutoCloseable {
-    private static final Log log = Log.getLog(RMLock.class);
-
-    private final Path lockFilePath;
-
-    public RMLock(Path lockFilePath) {
-        this.lockFilePath = lockFilePath;
-    }
-
-    /**
-     * Unlock resource and remove .lock file
-     */
-    public void unlock() {
-        try {
-            Files.deleteIfExists(lockFilePath);
-        } catch (IOException e) {
-            log.error("Failed to unlock file: " + lockFilePath, e);
-            if (Files.exists(lockFilePath)) {
-                // file still locket, try to unlock again
-                unlock();
-            }
-        }
-    }
-
-    /**
-     * @return path to the lock file
-     */
-    protected Path getLockFilePath() {
-        return lockFilePath;
-    }
-
-    @Override
-    public void close() {
-        unlock();
-    }
-}
@@ -1,110 +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.rm.lock;
-
-public class RMLockInfo {
-    private final String applicationId;
-    private final String projectId;
-    private final String operationId;
-    private final String operationName;
-    private final long operationStartTime;
-
-    private RMLockInfo(
-        String applicationId,
-        String projectId,
-        String operationId,
-        String operationName,
-        long operationStartTime
-    ) {
-        this.applicationId = applicationId;
-        this.projectId = projectId;
-        this.operationId = operationId;
-        this.operationName = operationName;
-        this.operationStartTime = operationStartTime;
-    }
-
-    static RMLockInfo emptyLock(
-        String projectId
-    ) {
-        return new RMLockInfo(
-            "",
-            projectId,
-            "",
-            "",
-            System.currentTimeMillis()
-        );
-    }
-
-
-    public boolean isBlank() {
-        return operationId.isEmpty();
-    }
-
-    public String getApplicationId() {
-        return applicationId;
-    }
-
-    public String getProjectId() {
-        return projectId;
-    }
-
-    public String getOperationId() {
-        return operationId;
-    }
-
-    public String getOperationName() {
-        return operationName;
-    }
-
-    public long getOperationStartTime() {
-        return operationStartTime;
-    }
-
-    public static final class Builder {
-        private String applicationId;
-        private final String projectId;
-        private final String operationId;
-        private String operationName;
-        private long operationStartTime;
-
-        public Builder(String projectId, String operationId) {
-            this.projectId = projectId;
-            this.operationId = operationId;
-        }
-
-
-        public Builder setApplicationId(String applicationId) {
-            this.applicationId = applicationId;
-            return this;
-        }
-
-
-        public Builder setOperationName(String operationName) {
-            this.operationName = operationName;
-            return this;
-        }
-
-        public Builder setOperationStartTime(long operationStartTime) {
-            this.operationStartTime = operationStartTime;
-            return this;
-        }
-
-        public RMLockInfo build() {
-            return new RMLockInfo(applicationId, projectId, operationId, operationName, operationStartTime);
-        }
-    }
-}
--- a/Show More
+++ b/Show More