From 5342a62289fb6b20fb58d4902148a0966a88c8a4 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Wed, 29 Jun 2011 16:25:58 +0000
Subject: [PATCH] sanofi: add "ext-lib" folder in the DSS. The libraries in
"ext-lib" will be kept between software upgrade. We will use the "ext-lib"
for installation-specific binaries (e.g. the Oracle JDBC drivers needed to
connect to the ABASE DB in Sanofi)
SVN: 21914
---
datastore_server/dist/datastore_server.sh | 6 ++++--
datastore_server/dist/ext-lib/README.txt | 11 +++++++++++
screening/dist/admin/backup-config.sh | 2 ++
screening/dist/admin/common-functions.sh | 2 +-
screening/dist/admin/restore-config-from-backup.sh | 2 ++
5 files changed, 20 insertions(+), 3 deletions(-)
create mode 100644 datastore_server/dist/ext-lib/README.txt
diff --git a/datastore_server/dist/datastore_server.sh b/datastore_server/dist/datastore_server.sh
index 13881cddcbc..31ccfae8846 100755
--- a/datastore_server/dist/datastore_server.sh
+++ b/datastore_server/dist/datastore_server.sh
@@ -107,6 +107,8 @@ LOGFILE=log/datastore_server_log.txt
STARTUPLOG=log/startup_log.txt
SUCCESS_MSG="Data Store Server ready and waiting for data"
LIB_FOLDER=lib
+# contains custom libraries e.g. JDBC drivers for external databases
+EXT_LIB_FOLDER=ext-lib
MAX_LOOPS=10
#
@@ -133,8 +135,8 @@ fi
command=$1
ALL_JAVA_OPTS="-Djavax.net.ssl.trustStore=etc/openBIS.keystore -Dpython.path=lib/jython-lib $JAVA_OPTS"
-# Build classpath from $LIB_FOLDER content. First JAR is datastore_server.jar because it has to appear before cifex.jar
-CP=`echo $LIB_FOLDER/datastore_server.jar $LIB_FOLDER/*.jar | sed 's/ /:/g'`
+# Build classpath from $LIB_FOLDER and $EXT_LIB_FOLDER content. First JAR is datastore_server.jar because it has to appear before cifex.jar
+CP=`echo $LIB_FOLDER/datastore_server.jar $LIB_FOLDER/*.jar $EXT_LIB_FOLDER/*.jar | sed 's/ /:/g'`
CMD="${JAVA_BIN} ${ALL_JAVA_OPTS} -classpath $CP ch.systemsx.cisd.openbis.dss.generic.DataStoreServer"
diff --git a/datastore_server/dist/ext-lib/README.txt b/datastore_server/dist/ext-lib/README.txt
new file mode 100644
index 00000000000..5de7263704d
--- /dev/null
+++ b/datastore_server/dist/ext-lib/README.txt
@@ -0,0 +1,11 @@
+This folder contains libraries (JAR files) that are not part of the standard
+openBIS installation, but are needed for the normal work of the system.
+
+One good example for such libraries are JDBC drivers required to connect to
+an external database (e.g. Oracle).
+
+Administrators are encouraged to copy the extension libraries here as they will
+be kept by the openBIS upgrade scripts (as opposed to the contents of the 'lib'
+folder which are wiped out after a software upgrade).
+
+
\ No newline at end of file
diff --git a/screening/dist/admin/backup-config.sh b/screening/dist/admin/backup-config.sh
index d63cca1ec87..2d65840f653 100755
--- a/screening/dist/admin/backup-config.sh
+++ b/screening/dist/admin/backup-config.sh
@@ -37,5 +37,7 @@ cp $ROOT/datastore_server/etc/log.xml $CONF/dss-log.xml
cp $ROOT/datastore_server/etc/datastore_server.conf $CONF/datastore_server.conf
# not always present
copyIfExists $ROOT/datastore_server/etc/openBIS.keystore $CONF/.keystore
+copyIfExists $ROOT/datastore_server/ext-lib $CONF
+
# screening-specific
cp $ROOT/datastore_server/etc/tabular-data-graph.properties $CONF/tabular-data-graph.properties
diff --git a/screening/dist/admin/common-functions.sh b/screening/dist/admin/common-functions.sh
index 2a00c32541f..63283870d5c 100644
--- a/screening/dist/admin/common-functions.sh
+++ b/screening/dist/admin/common-functions.sh
@@ -37,6 +37,6 @@ executeScriptHooks()
copyIfExists()
{
if [ -f "$1" ]; then
- cp "$1" "$2"
+ cp -R "$1" "$2"
fi
}
\ No newline at end of file
diff --git a/screening/dist/admin/restore-config-from-backup.sh b/screening/dist/admin/restore-config-from-backup.sh
index 23ea3ce139f..9ef1fbef12a 100755
--- a/screening/dist/admin/restore-config-from-backup.sh
+++ b/screening/dist/admin/restore-config-from-backup.sh
@@ -44,5 +44,7 @@ cp $CONF/dss-log.xml $ROOT/datastore_server/etc/log.xml
cp $CONF/datastore_server.conf $ROOT/datastore_server/etc/
# not always present
copyIfExists $CONF/.keystore $ROOT/datastore_server/etc/openBIS.keystore
+copyIfExists $CONF/ext-lib $ROOT/datastore_server
+
# screening-specific
cp $CONF/tabular-data-graph.properties $ROOT/datastore_server/etc/
--
GitLab