From 4b8885d15b78215bf270d421c5097cb56957392c Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Thu, 13 Dec 2007 15:31:52 +0000
Subject: [PATCH] LMS-182 This client has the wrong service version for the
server (part 1) - lims-client, lims-server -> openBIS-client, openBIS-server
- lims.keystore -> openBIS.keystore
SVN: 3075
---
integration-tests/run.sh | 10 +++++-----
.../templates/etlserver-analys/etlserver.sh | 2 +-
integration-tests/templates/etlserver-raw/etlserver.sh | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/integration-tests/run.sh b/integration-tests/run.sh
index 5cc99780ca1..1077a276a08 100755
--- a/integration-tests/run.sh
+++ b/integration-tests/run.sh
@@ -14,9 +14,9 @@ TARGETS=targets
WORK=$TARGETS/playground
INSTALL=$TARGETS/install
-LIMS_SERVER_NAME=lims-server
+LIMS_SERVER_NAME=openBIS-server
LIMS_SERVER=$WORK/$LIMS_SERVER_NAME
-LIMS_CLIENT_NAME=lims-client
+LIMS_CLIENT_NAME=openBIS-client
LIMS_CLIENT=$WORK/$LIMS_CLIENT_NAME
DATA=$WORK/data
@@ -115,8 +115,8 @@ function wait_for_server {
function install_lims_server {
cp -R $TEMPLATE/$LIMS_SERVER_NAME $WORK
- unzip -d $LIMS_SERVER $INSTALL/lims-server*.zip
- $LIMS_SERVER/lims-server/install.sh $PWD/$LIMS_SERVER $LIMS_SERVER/service.properties $LIMS_SERVER/roles.conf
+ unzip -d $LIMS_SERVER $INSTALL/openBIS-server*.zip
+ $LIMS_SERVER/openBIS-server/install.sh $PWD/$LIMS_SERVER $LIMS_SERVER/service.properties $LIMS_SERVER/roles.conf
wait_for_server
}
@@ -137,7 +137,7 @@ function register_cell_plates {
}
function install_lims_client {
- unpack lims-client
+ unpack openBIS-client
cp -fR $TEMPLATE/$LIMS_CLIENT_NAME $WORK
}
diff --git a/integration-tests/templates/etlserver-analys/etlserver.sh b/integration-tests/templates/etlserver-analys/etlserver.sh
index b1c99958be4..0a9ff523e8b 100755
--- a/integration-tests/templates/etlserver-analys/etlserver.sh
+++ b/integration-tests/templates/etlserver-analys/etlserver.sh
@@ -1,3 +1,3 @@
#! /bin/sh
./shutdown.sh
-java -ea -Djavax.net.ssl.trustStore=etc/lims.keystore -jar lib/etlserver.jar "$@" & echo $! > running.pid
\ No newline at end of file
+java -ea -Djavax.net.ssl.trustStore=etc/openBIS.keystore -jar lib/etlserver.jar "$@" & echo $! > running.pid
\ No newline at end of file
diff --git a/integration-tests/templates/etlserver-raw/etlserver.sh b/integration-tests/templates/etlserver-raw/etlserver.sh
index b1c99958be4..0a9ff523e8b 100755
--- a/integration-tests/templates/etlserver-raw/etlserver.sh
+++ b/integration-tests/templates/etlserver-raw/etlserver.sh
@@ -1,3 +1,3 @@
#! /bin/sh
./shutdown.sh
-java -ea -Djavax.net.ssl.trustStore=etc/lims.keystore -jar lib/etlserver.jar "$@" & echo $! > running.pid
\ No newline at end of file
+java -ea -Djavax.net.ssl.trustStore=etc/openBIS.keystore -jar lib/etlserver.jar "$@" & echo $! > running.pid
\ No newline at end of file
--
GitLab