Skip to content
Snippets Groups Projects
Commit 4b8885d1 authored by tpylak's avatar tpylak
Browse files

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
parent 4356884d
No related branches found
No related tags found
No related merge requests found
...@@ -14,9 +14,9 @@ TARGETS=targets ...@@ -14,9 +14,9 @@ TARGETS=targets
WORK=$TARGETS/playground WORK=$TARGETS/playground
INSTALL=$TARGETS/install INSTALL=$TARGETS/install
LIMS_SERVER_NAME=lims-server LIMS_SERVER_NAME=openBIS-server
LIMS_SERVER=$WORK/$LIMS_SERVER_NAME LIMS_SERVER=$WORK/$LIMS_SERVER_NAME
LIMS_CLIENT_NAME=lims-client LIMS_CLIENT_NAME=openBIS-client
LIMS_CLIENT=$WORK/$LIMS_CLIENT_NAME LIMS_CLIENT=$WORK/$LIMS_CLIENT_NAME
DATA=$WORK/data DATA=$WORK/data
...@@ -115,8 +115,8 @@ function wait_for_server { ...@@ -115,8 +115,8 @@ function wait_for_server {
function install_lims_server { function install_lims_server {
cp -R $TEMPLATE/$LIMS_SERVER_NAME $WORK cp -R $TEMPLATE/$LIMS_SERVER_NAME $WORK
unzip -d $LIMS_SERVER $INSTALL/lims-server*.zip unzip -d $LIMS_SERVER $INSTALL/openBIS-server*.zip
$LIMS_SERVER/lims-server/install.sh $PWD/$LIMS_SERVER $LIMS_SERVER/service.properties $LIMS_SERVER/roles.conf $LIMS_SERVER/openBIS-server/install.sh $PWD/$LIMS_SERVER $LIMS_SERVER/service.properties $LIMS_SERVER/roles.conf
wait_for_server wait_for_server
} }
...@@ -137,7 +137,7 @@ function register_cell_plates { ...@@ -137,7 +137,7 @@ function register_cell_plates {
} }
function install_lims_client { function install_lims_client {
unpack lims-client unpack openBIS-client
cp -fR $TEMPLATE/$LIMS_CLIENT_NAME $WORK cp -fR $TEMPLATE/$LIMS_CLIENT_NAME $WORK
} }
......
#! /bin/sh #! /bin/sh
./shutdown.sh ./shutdown.sh
java -ea -Djavax.net.ssl.trustStore=etc/lims.keystore -jar lib/etlserver.jar "$@" & echo $! > running.pid java -ea -Djavax.net.ssl.trustStore=etc/openBIS.keystore -jar lib/etlserver.jar "$@" & echo $! > running.pid
\ No newline at end of file \ No newline at end of file
#! /bin/sh #! /bin/sh
./shutdown.sh ./shutdown.sh
java -ea -Djavax.net.ssl.trustStore=etc/lims.keystore -jar lib/etlserver.jar "$@" & echo $! > running.pid java -ea -Djavax.net.ssl.trustStore=etc/openBIS.keystore -jar lib/etlserver.jar "$@" & echo $! > running.pid
\ No newline at end of file \ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment