Merge branch 'devel' into CB-5559-root-uri-oidc-single-sign-on

deploy/build-backend.sh

@@ -2,12 +2,6 @@
 set -Eeo pipefail
 set +u
 
-# #command line arguments
-# CONFIGURATION_PATH=${1-"../config/sample-databases/DefaultConfiguration"}
-# SAMPLE_DATABASE_PATH=${2-""}
-
-# echo $CONFIGURATION_PATH
-# echo $SAMPLE_DATABASE_PATH
 echo "Clone and build Cloudbeaver"
 
 rm -rf ./drivers
@@ -43,20 +37,8 @@ cp -rp ../server/product/web-server/target/products/io.cloudbeaver.product/all/a
 cp -p ./scripts/* ./cloudbeaver
 mkdir cloudbeaver/samples
 
-if [[ -z $SAMPLE_DATABASE_PATH  ]]; then
-  SAMPLE_DATABASE_PATH=""
-else
-  mkdir cloudbeaver/samples/db
-  cp -rp "${SAMPLE_DATABASE_PATH}" cloudbeaver/samples/
-fi
-
-if [[ -z "$CONFIGURATION_PATH" ]]; then
-  CONFIGURATION_PATH="../config/sample-databases/DefaultConfiguration"
-fi
-
 cp -rp  ../config/core/* cloudbeaver/conf
-cp -rp "${CONFIGURATION_PATH}"/GlobalConfiguration/.dbeaver/data-sources.json cloudbeaver/conf/initial-data-sources.conf
-cp -p "${CONFIGURATION_PATH}"/*.conf cloudbeaver/conf/
+cp -rp ../config/GlobalConfiguration/.dbeaver/data-sources.json cloudbeaver/conf/initial-data-sources.conf
 mv drivers cloudbeaver
 
 echo "End of backend build"

deploy/build.bat

@@ -1,11 +1,6 @@
 @echo off
 
 rem command line arguments
-SET CONFIGURATION_PATH=%1
-SET SAMPLE_DATABASE_PATH=%2
-
-IF "%CONFIGURATION_PATH%"=="" SET CONFIGURATION_PATH="..\config\sample-databases\DefaultConfiguration"
-echo "Configuration path=%CONFIGURATION_PATH%"
 
 echo Clone and build Cloudbeaver
 
@@ -40,13 +35,9 @@ xcopy /E /Q ..\server\product\web-server\target\products\io.cloudbeaver.product\
 copy scripts\* cloudbeaver >NUL
 mkdir cloudbeaver\samples
 
-IF NOT "%SAMPLE_DATABASE_PATH%"=="" (
-    mkdir cloudbeaver\samples\db
-    xcopy /E /Q %SAMPLE_DATABASE_PATH% cloudbeaver\samples\db >NUL
-)
+
 copy ..\config\core\* cloudbeaver\conf >NUL
-copy %CONFIGURATION_PATH%\GlobalConfiguration\.dbeaver\data-sources.json cloudbeaver\conf\initial-data-sources.conf >NUL
-copy %CONFIGURATION_PATH%\*.conf cloudbeaver\conf >NUL
+copy ..\config\DefaultConfiguration\GlobalConfiguration\.dbeaver\data-sources.json cloudbeaver\conf\initial-data-sources.conf >NUL
 
 move drivers cloudbeaver >NUL
 

deploy/build.sh

@@ -1,9 +1,5 @@
 #!/bin/bash
 set -Eeuo pipefail
 
-#command line arguments
-CONFIGURATION_PATH="../config/sample-databases/DefaultConfiguration"
-SAMPLE_DATABASE_PATH=""
-
 source build-backend.sh 
 source build-frontend.sh

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

@@ -38,21 +38,18 @@ public abstract class BaseWebProjectImpl extends BaseProjectImpl implements RMCo
     @NotNull
     private final Path path;
     @NotNull
-    protected final DataSourceFilter dataSourceFilter;
     private final RMController resourceController;
 
     public BaseWebProjectImpl(
         @NotNull DBPWorkspace workspace,
         @NotNull RMController resourceController,
         @NotNull SMSessionContext sessionContext,
-        @NotNull RMProject project,
-        @NotNull DataSourceFilter dataSourceFilter
+        @NotNull RMProject project
     ) {
         super(workspace, sessionContext);
         this.resourceController = resourceController;
         this.path = RMUtils.getProjectPath(project);
         this.project = project;
-        this.dataSourceFilter = dataSourceFilter;
     }
 
     @NotNull
@@ -104,11 +101,6 @@ public boolean isUseSecretStorage() {
         return false;
     }
 
-    @NotNull
-    public RMProject getRmProject() {
-        return this.project;
-    }
-
     /**
      * Method for Bulk Update of resources properties paths
      *

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

@@ -33,16 +33,15 @@
 public abstract class WebProjectImpl extends BaseWebProjectImpl {
     private static final Log log = Log.getLog(WebProjectImpl.class);
     @NotNull
-    private final DBPPreferenceStore preferenceStore;
+    protected final DBPPreferenceStore preferenceStore;
     public WebProjectImpl(
         @NotNull DBPWorkspace workspace,
         @NotNull RMController resourceController,
         @NotNull SMSessionContext sessionContext,
         @NotNull RMProject project,
-        @NotNull DataSourceFilter dataSourceFilter,
         @NotNull DBPPreferenceStore preferenceStore
     ) {
-        super(workspace, resourceController, sessionContext, project, dataSourceFilter);
+        super(workspace, resourceController, sessionContext, project);
         this.preferenceStore = preferenceStore;
     }
 
@@ -82,8 +81,13 @@ public DBTTaskManager getTaskManager() {
     protected DBPDataSourceRegistry createDataSourceRegistry() {
         return new WebDataSourceRegistryProxy(
             new DataSourceRegistryRM(this, getResourceController(), preferenceStore),
-            dataSourceFilter
+            getDataSourceFilter()
         );
     }
 
+    @NotNull
+    public DataSourceFilter getDataSourceFilter() {
+        return (ds) -> true;
+    }
+
 }