From 01c3773e6044583a5128c965b533835289d8f87a Mon Sep 17 00:00:00 2001
From: alaskowski <alaskowski@ethz.ch>
Date: Thu, 2 Feb 2023 16:45:41 +0100
Subject: [PATCH] ssdm-13365 gradle config rename from datastore_server to
server-original-data-store
---
installation/resource/installer/bin/backup-databases.sh | 2 +-
.../resource/installer/bin/restore-config-from-backup.sh | 2 +-
openbis_standard_technologies/build.gradle | 8 ++++----
server-original-data-store/dist/autosymlink.sh | 2 +-
server-original-data-store/dist/datastore_server.sh | 2 +-
server-original-data-store/dist/share-manager.sh | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/installation/resource/installer/bin/backup-databases.sh b/installation/resource/installer/bin/backup-databases.sh
index 61d49b7e2fc..fb11bd39fb7 100755
--- a/installation/resource/installer/bin/backup-databases.sh
+++ b/installation/resource/installer/bin/backup-databases.sh
@@ -16,7 +16,7 @@ set -o errexit
function listDatabases() {
local LIB=$DSS_SERVER/lib
- CP=`echo $LIB/datastore_server.jar $LIB/*.jar | sed 's/ /:/g'`
+ CP=`echo $LIB/server-original-data-store.jar $LIB/*.jar | sed 's/ /:/g'`
DB_LIST=$(java -cp $CP ch.systemsx.cisd.openbis.dss.generic.server.dbbackup.BackupDatabaseDescriptionGenerator $@)
}
diff --git a/installation/resource/installer/bin/restore-config-from-backup.sh b/installation/resource/installer/bin/restore-config-from-backup.sh
index 15a20541ffa..6efc2edcaaa 100755
--- a/installation/resource/installer/bin/restore-config-from-backup.sh
+++ b/installation/resource/installer/bin/restore-config-from-backup.sh
@@ -51,7 +51,7 @@ if [ -d $ROOT/openBIS-server ]; then
fi
# -- DSS
-version=`unzip -c $ROOT/datastore_server/lib/datastore_server-*.jar BUILD-datastore_server.INFO|tail -n 1`
+version=`unzip -c $ROOT/datastore_server/lib/server-original-data-store-*.jar BUILD-datastore_server.INFO|tail -n 1`
restore $CONF/dss-service.properties $ROOT/datastore_server/etc service.properties
restore $CONF/dss-log.xml $ROOT/datastore_server/etc log.xml
restore $CONF/datastore_server.conf $ROOT/datastore_server/etc datastore_server.conf
diff --git a/openbis_standard_technologies/build.gradle b/openbis_standard_technologies/build.gradle
index d7c1df8ee45..ddde9c4263a 100644
--- a/openbis_standard_technologies/build.gradle
+++ b/openbis_standard_technologies/build.gradle
@@ -53,7 +53,7 @@ archivesBaseName = 'openBIS-server-standard-technologies'
configurations.create('gwt')
configurations.create('zipping')
-configurations.create('datastore_server')
+configurations.create('server-original-data-store')
configurations.create('javadoc_sources')
configurations.create('javadoc_compilation')
@@ -78,7 +78,7 @@ dependencies {
zipping "eclipse:jetty-distribution:${jettyVersion}@zip"
- datastore_server project(':server-screening'),
+ "server-original-data-store" project(':server-screening'),
'bioformats:bioformats:6.5.1',
'imagej:ij:1.43u',
'cisd:cisd-openbis-knime-server:13.6.0.r29301',
@@ -414,8 +414,8 @@ zip.dependsOn checksums
task zipDss(type: Zip, dependsOn: copyJarsForWebStart) {
baseName 'datastore_server-standard-technologies'
includeEmptyDirs true
-
- from(configurations.datastore_server) {
+
+ from("server-original-data-store") {
into 'datastore_server/lib'
exclude '**/antlr*.jar'
exclude '**/fastutil*.jar'
diff --git a/server-original-data-store/dist/autosymlink.sh b/server-original-data-store/dist/autosymlink.sh
index 69deef338c2..568d32857b6 100755
--- a/server-original-data-store/dist/autosymlink.sh
+++ b/server-original-data-store/dist/autosymlink.sh
@@ -1,6 +1,6 @@
#!/bin/bash
pushd . > /dev/null
cd `dirname $0`
-java -cp "lib/datastore_server.jar:lib/*" ch.systemsx.cisd.openbis.dss.generic.shared.utils.AutoSymlink 2>&1 |grep -v log4j
+java -cp "lib/server-original-data-store.jar:lib/*" ch.systemsx.cisd.openbis.dss.generic.shared.utils.AutoSymlink 2>&1 |grep -v log4j
popd > /dev/null
diff --git a/server-original-data-store/dist/datastore_server.sh b/server-original-data-store/dist/datastore_server.sh
index 09765a5e40a..50efc171a7c 100755
--- a/server-original-data-store/dist/datastore_server.sh
+++ b/server-original-data-store/dist/datastore_server.sh
@@ -154,7 +154,7 @@ unzip -q lib/sis-jhdf5-*.jar -d $LIB_FOLDER native/*
# Build classpath from $LIB_FOLDER and $EXT_LIB_FOLDER content.
# datastore_server.jar and lib-common.jar have to appear before cifex.jar
-CP=`echo $LIB_FOLDER/slf4j-log4j12-1.6.2.jar $LIB_FOLDER/datastore_server.jar $LIB_FOLDER/lib-common.jar \
+CP=`echo $LIB_FOLDER/slf4j-log4j12-1.6.2.jar $LIB_FOLDER/server-original-data-store.jar $LIB_FOLDER/lib-common.jar \
$LIB_FOLDER/dbmigration*.jar $LIB_FOLDER/*.jar $EXT_LIB_FOLDER/*.jar \
| sed 's/\(.*\) [^ ]*jython27[^ ]* \(.*\)/\1 \2/g' \
| sed 's/ /:/g'`
diff --git a/server-original-data-store/dist/share-manager.sh b/server-original-data-store/dist/share-manager.sh
index de1e871e027..94ea3fdeff2 100644
--- a/server-original-data-store/dist/share-manager.sh
+++ b/server-original-data-store/dist/share-manager.sh
@@ -17,5 +17,5 @@ else
JAVA_BIN="java"
fi
-CP=`echo $LIB_FOLDER/datastore_server.jar $LIB_FOLDER/*.jar | sed 's/ /:/g'`
+CP=`echo $LIB_FOLDER/server-original-data-store.jar $LIB_FOLDER/*.jar | sed 's/ /:/g'`
"$JAVA_BIN" $JAVA_OPTS -classpath $CP ch.systemsx.cisd.openbis.dss.client.admin.ShareManagerApplication "$@"
\ No newline at end of file
--
GitLab