LMS-1546 HCS distribution: fix port number

SVN: 16755

integration-tests/common.bash

@@ -10,13 +10,13 @@ FALSE=0
 TEMPLATE=templates
 TARGETS=targets
 WORK=$TARGETS/playground
+ERR_LOG=$WORK/all_err_log.txt
+
 INSTALL=$TARGETS/install
 LOCAL_PROJECTS=..
 
 OPENBIS_SERVER=$WORK/openBIS-server
 
-ERR_LOG=$WORK/all_err_log.txt
-
 SSH_CRUISE_CONTROL_NAME=ci@cisd-vesuvio.ethz.ch
 CRUISE_CONTROL_ARTIFACTS=cruisecontrol-bin/artifacts
 

integration-tests/test-screening.sh

@@ -7,13 +7,16 @@
 
 source common.bash
 
+WORK=$TARGETS/playground-screening
+ERR_LOG=$WORK/all_err_log.txt
+
 # --------------------
 
 SVN_WEB_SRC_HCS=http://svncisd.ethz.ch/repos/cisd/screening/trunk
 OPENBIS_DATABASE_HCS=openbis_screening_integration_tests
 IMAGING_DB=imaging_integration_tests
 
-WORK=$TARGETS/playground-screening
+
 DATA_TEMPLATE=$TEMPLATE/data-screening.zip
 OPENBIS_SERVER_HCS=$WORK/openBIS-server-screening
 DSS_DIR_NAME=datastore_server_screening
@@ -49,8 +52,6 @@ function install_and_run_openbis_server_screening {
 		local openbis_server_dir=$OPENBIS_SERVER_HCS
 		local openbis_server_name=`basename $openbis_server_dir`
 		
-		cat $TEMPLATE/$openbis_server_name/integration-tests-service.properties >> $openbis_server_dir/jetty/etc/service.properties
-		
 		restore_database $OPENBIS_DATABASE_HCS $TEMPLATE/$openbis_server_name/test_database.sql
     if [ $install_openbis == "true" ]; then
         rm -fr $openbis_server_dir
@@ -58,7 +59,8 @@ function install_and_run_openbis_server_screening {
         unzip -d $openbis_server_dir $INSTALL/openBIS*.zip
         mv $openbis_server_dir/openBIS-server/* $openbis_server_dir
 				rmdir $openbis_server_dir/openBIS-server
-		
+
+				cat $TEMPLATE/$openbis_server_name/integration-tests-service.properties >> $openbis_server_dir/service.properties
 				$openbis_server_dir/install.sh $PWD/$openbis_server_dir
 				startup_openbis_server $openbis_server_dir
 				wait_for_server

screening/dist/etc/service.properties

@@ -48,7 +48,7 @@ highwater-mark = -1
 notify-successful-registration = false
 
 # The URL of the openBIS server
-server-url = ${host-address}:${port}
+server-url = ${host-address}:8443
 
 # The username to use when contacting the openBIS server
 username = etlserver
@@ -57,7 +57,7 @@ username = etlserver
 password = etlserver_password
 
 # The base URL for Web client access to the data store server.
-download-url = ${host-address}:8444
+download-url = ${host-address}:${port}
 
 # SMTP properties (must start with 'mail' to be considered).
 # The current configuration saves the emails in the file system in the root directory