CB-5589. Remove script and sqllite database config (#2919)

* CB-5589. Remove script and sqllite database config * CB-5589. Remove script and sqllite database config * CB-5589 remove sample database --------- Co-authored-by: mr-anton-t <[email protected]> Co-authored-by: Aleksandr Skoblikov <[email protected]> Co-authored-by: Evgenia Bezborodova <[email protected]>
dbeaver · Sep 30, 2024 · a42c7dc · a42c7dc
1 parent eb33e0e
commit a42c7dc
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 195 deletions.
diff --git a/...lConfiguration/.dbeaver/data-sources.json → ...lConfiguration/.dbeaver/data-sources.json b/...lConfiguration/.dbeaver/data-sources.json → ...lConfiguration/.dbeaver/data-sources.json
diff --git a/...ration/.dbeaver/provided-connections.json → ...ration/.dbeaver/provided-connections.json b/...ration/.dbeaver/provided-connections.json → ...ration/.dbeaver/provided-connections.json
diff --git a/...ses/DefaultConfiguration/cloudbeaver.conf → config/core/cloudbeaver.conf b/...ses/DefaultConfiguration/cloudbeaver.conf → config/core/cloudbeaver.conf
diff --git a/config/sample-databases/README.md b/config/sample-databases/README.md
diff --git a/config/sample-databases/SQLiteConfiguration/GlobalConfiguration/.dbeaver/data-sources.json b/config/sample-databases/SQLiteConfiguration/GlobalConfiguration/.dbeaver/data-sources.json
diff --git a/...mple-databases/SQLiteConfiguration/GlobalConfiguration/.dbeaver/provided-connections.json b/...mple-databases/SQLiteConfiguration/GlobalConfiguration/.dbeaver/provided-connections.json
diff --git a/config/sample-databases/SQLiteConfiguration/cloudbeaver.conf b/config/sample-databases/SQLiteConfiguration/cloudbeaver.conf
diff --git a/config/sample-databases/db/Chinook.sqlitedb b/config/sample-databases/db/Chinook.sqlitedb
diff --git a/config/sample-databases/db/README b/config/sample-databases/db/README
diff --git a/deploy/build-backend.sh b/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"
diff --git a/deploy/build-sqlite.bat b/deploy/build-sqlite.bat
diff --git a/deploy/build-sqlite.sh b/deploy/build-sqlite.sh
diff --git a/deploy/build.bat b/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
 

diff --git a/deploy/build.sh b/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